golem
/
MinervaNeue
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Don't ship 2 magnifying glass icons"

This commit is contained in:
jenkins-bot 2018-07-24 18:14:19 +00:00 committed by Gerrit Code Review
parent 0364e741cb 775af007f0
commit 65728feb27
5 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/skins.minerva.base.styles/magnifying-glass.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.9 KiB

3
resources/skins.minerva.base.styles/ui.less
View File

@ -143,9 +143,6 @@ body {
.search {
@searchIconSize: 20px;
@searchIconGutter: 6px;
// FIXME: input's cannot have child elements so not possible to use mw-ui-icon-before here
// How can we avoid multiple use of magnifying glass icon?
.background-image-svg( 'magnifying-glass.svg', 'magnifying-glass.png' );
outline: 0;
width: 100%;
// FIXME: unable to check but the important may not be needed for Nokia S60;

0
resources/skins.minerva.base.styles/magnifying-glass.svg → resources/skins.minerva.content.styles.images/magnifying-glass.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 471 B

After

Width:  |  Height:  |  Size: 471 B

1
resources/skins.minerva.icons.images/magnifying-glass.svg
View File

@ -1 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><title>magnifying glass</title><path fill="#54595d" fill-rule="evenodd" d="M16.474 15.44c1.147-1.375 1.835-3.21 1.835-5.16a7.98 7.98 0 0 0-8.03-8.03 7.98 7.98 0 0 0-8.03 8.03 7.98 7.98 0 0 0 8.03 8.03c1.72 0 3.21-.46 4.47-1.378l4.473 4.474c.46.46 1.262.46 1.836 0l.69-.688-5.278-5.277zm-11.93-5.16c0-3.21 2.524-5.735 5.735-5.735 3.21 0 5.732 2.524 5.732 5.735 0 3.212-2.524 5.736-5.736 5.736-3.212 0-5.736-2.638-5.736-5.736z"/></svg>
Side by Side

Before

Width:  |  Height:  |  Size: 554 B

8
skin.json
View File

@ -173,17 +173,18 @@
},
"skins.minerva.content.styles.images": {
"class": "ResourceLoaderImageModule",
"selector": "a.{name}",
"selector": "{name}",
"defaultColor": "#36c",
"useDataURI": false,
"images": {
"external": {
"input.search,.mw-ui-icon-minerva-magnifying-glass:before": "resources/skins.minerva.content.styles.images/magnifying-glass.svg",
"a.external": {
"file": {
"ltr": "resources/skins.minerva.content.styles.images/link-external-ltr.svg",
"rtl": "resources/skins.minerva.content.styles.images/link-external-rtl.svg"
}
},
"extiw": {
"a.extiw": {
"file": {
"ltr": "resources/skins.minerva.content.styles.images/link-internal-ltr.svg",
"rtl": "resources/skins.minerva.content.styles.images/link-internal-rtl.svg"
@ -218,7 +219,6 @@
"mainmenu": "resources/skins.minerva.icons.images/hamburger.svg",
"edit": "resources/skins.minerva.icons.images/editLocked.svg",
"edit-enabled": "resources/skins.minerva.icons.images/edit.svg",
"magnifying-glass": "resources/skins.minerva.icons.images/magnifying-glass.svg",
"language-switcher": "resources/skins.minerva.icons.images/languageSwitcher.svg"
}
},