From 775af007f0e78356d8cfe782095eb69837a8d6d6 Mon Sep 17 00:00:00 2001 From: jdlrobson Date: Thu, 5 Jul 2018 16:34:31 -0700 Subject: [PATCH] Don't ship 2 magnifying glass icons We already make use of the images 'name' key inside skins.minerva.content.styles.images to define the full CSS selector. We can use this approach to ship a single version of the magnifying glass icon, rather than having 2 defined in both skins.minerva.base.styles and skins.minerva.icons.images Change-Id: Ie5ec06152c418c4aa1b620b3d0a904cc9517e5d0 --- .../magnifying-glass.png | Bin 8053 -> 0 bytes resources/skins.minerva.base.styles/ui.less | 3 --- .../magnifying-glass.svg | 0 .../magnifying-glass.svg | 1 - skin.json | 8 ++++---- 5 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 resources/skins.minerva.base.styles/magnifying-glass.png rename resources/{skins.minerva.base.styles => skins.minerva.content.styles.images}/magnifying-glass.svg (100%) delete mode 100644 resources/skins.minerva.icons.images/magnifying-glass.svg diff --git a/resources/skins.minerva.base.styles/magnifying-glass.png b/resources/skins.minerva.base.styles/magnifying-glass.png deleted file mode 100644 index fa603b3fc95c7c84727329b474b4851316564b88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8053 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 glass \ No newline at end of file diff --git a/skin.json b/skin.json index 033f49d..5dddf04 100644 --- a/skin.json +++ b/skin.json @@ -174,16 +174,17 @@ }, "skins.minerva.content.styles.images": { "class": "ResourceLoaderImageModule", - "selector": "a.{name}", + "selector": "{name}", "defaultColor": "#36c", "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" @@ -216,7 +217,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" } },