From a587552934bbc64fd720fa04838ccc23a5632155 Mon Sep 17 00:00:00 2001 From: jdlrobson Date: Tue, 26 May 2015 21:41:54 +0200 Subject: [PATCH] Remove mw-ui-icon*:after Not being used anywhere from what I can see. Change-Id: I83cff1444a12fdd390f78dd1c09b5b09b0c84704 --- resources/Resources.php | 60 +++++++++---------- .../src/mediawiki.ui/components/icons.less | 17 ------ 2 files changed, 30 insertions(+), 47 deletions(-) diff --git a/resources/Resources.php b/resources/Resources.php index 1f5ac164ad..a802350269 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1804,8 +1804,8 @@ return array( 'class' => 'ResourceLoaderImageModule', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons.json', - 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', - 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', + 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:before', + 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', ), 'oojs-ui.styles.indicators' => array( 'position' => 'top', @@ -1824,112 +1824,112 @@ return array( 'class' => 'ResourceLoaderImageModule', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-alerts.json', - 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', - 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', + 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:before', + 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', ), 'oojs-ui.styles.icons-content' => array( 'position' => 'top', 'class' => 'ResourceLoaderImageModule', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-content.json', - 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', - 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', + 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:before', + 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', ), 'oojs-ui.styles.icons-editing-advanced' => array( 'position' => 'top', 'class' => 'ResourceLoaderImageModule', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-editing-advanced.json', - 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', - 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', + 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:before', + 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', ), 'oojs-ui.styles.icons-editing-core' => array( 'position' => 'top', 'class' => 'ResourceLoaderImageModule', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-editing-core.json', - 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', - 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', + 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:before', + 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', ), 'oojs-ui.styles.icons-editing-list' => array( 'position' => 'top', 'class' => 'ResourceLoaderImageModule', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-editing-list.json', - 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', - 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', + 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:before', + 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', ), 'oojs-ui.styles.icons-editing-styling' => array( 'position' => 'top', 'class' => 'ResourceLoaderImageModule', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-editing-styling.json', - 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', - 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', + 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:before', + 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', ), 'oojs-ui.styles.icons-interactions' => array( 'position' => 'top', 'class' => 'ResourceLoaderImageModule', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-interactions.json', - 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', - 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', + 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:before', + 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', ), 'oojs-ui.styles.icons-layout' => array( 'position' => 'top', 'class' => 'ResourceLoaderImageModule', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-layout.json', - 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', - 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', + 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:before', + 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', ), 'oojs-ui.styles.icons-location' => array( 'position' => 'top', 'class' => 'ResourceLoaderImageModule', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-location.json', - 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', - 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', + 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:before', + 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', ), 'oojs-ui.styles.icons-media' => array( 'position' => 'top', 'class' => 'ResourceLoaderImageModule', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-media.json', - 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', - 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', + 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:before', + 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', ), 'oojs-ui.styles.icons-moderation' => array( 'position' => 'top', 'class' => 'ResourceLoaderImageModule', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-moderation.json', - 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', - 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', + 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:before', + 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', ), 'oojs-ui.styles.icons-movement' => array( 'position' => 'top', 'class' => 'ResourceLoaderImageModule', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-movement.json', - 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', - 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', + 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:before', + 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', ), 'oojs-ui.styles.icons-user' => array( 'position' => 'top', 'class' => 'ResourceLoaderImageModule', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-user.json', - 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', - 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', + 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:before', + 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', ), 'oojs-ui.styles.icons-wikimedia' => array( 'position' => 'top', 'class' => 'ResourceLoaderImageModule', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-wikimedia.json', - 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', - 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', + 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:before', + 'selectorWithVariant' => '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before', ), ); diff --git a/resources/src/mediawiki.ui/components/icons.less b/resources/src/mediawiki.ui/components/icons.less index a6e64904c2..d9e8c4202e 100644 --- a/resources/src/mediawiki.ui/components/icons.less +++ b/resources/src/mediawiki.ui/components/icons.less @@ -4,7 +4,6 @@ // Mixins .mixin-mw-ui-icon-bgimage(@iconSvg, @iconPng) { &.mw-ui-icon { - &:after, &:before { .background-image-svg(@iconSvg, @iconPng); } @@ -54,7 +53,6 @@ } } - &.mw-ui-icon-after:after, &.mw-ui-icon-before:before, &.mw-ui-icon-element:before { background-position: 50% 50%; @@ -81,19 +79,4 @@ margin-right: @iconGutterWidth; } } - - // Icons with text before - // - // Markup: - //
OK
- // - // Styleguide 6.1.3 - &.mw-ui-icon-after { - &:after { - position: relative; - float: right; - width: @iconSize; - margin-left: @iconGutterWidth; - } - } } -- 2.20.1