[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revert "Support changing icon variants on hover"

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395680 )

Change subject: Revert "Support changing icon variants on hover"
..


Revert "Support changing icon variants on hover"

This reverts commit 46c62ff5f474c6fe7a409863058e81bb678229b2. After 
reconsidering menu item treatment under UI Standardization perspective, we 
don't need and shouldn't use such pattern.

Bug: T110051
Change-Id: I0e8b6035f516e6629010b4f18471445c8833156e
---
M includes/resourceloader/ResourceLoaderOOUIImageModule.php
1 file changed, 2 insertions(+), 5 deletions(-)

Approvals:
  jenkins-bot: Verified
  VolkerE: Looks good to me, approved



diff --git a/includes/resourceloader/ResourceLoaderOOUIImageModule.php 
b/includes/resourceloader/ResourceLoaderOOUIImageModule.php
index ee87d8d..5c9e1d9 100644
--- a/includes/resourceloader/ResourceLoaderOOUIImageModule.php
+++ b/includes/resourceloader/ResourceLoaderOOUIImageModule.php
@@ -98,11 +98,8 @@
// Extra selectors to allow using the same icons for old-style 
MediaWiki UI code
if ( substr( $module, 0, 5 ) === 'icons' ) {
$definition['selectorWithoutVariant'] = 
'.oo-ui-icon-{name}, .mw-ui-icon-{name}:before';
-   $definition['selectorWithVariant'] = '
-   .oo-ui-image-{variant}.oo-ui-icon-{name}, 
.mw-ui-icon-{name}-{variant}:before,
-   /* Hack for Flow, see T110051 */
-   .mw-ui-hovericon:hover 
.mw-ui-icon-{name}-{variant}-hover:before,
-   
.mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before';
+   $definition['selectorWithVariant'] = 
'.oo-ui-image-{variant}.oo-ui-icon-{name}, ' .
+   '.mw-ui-icon-{name}-{variant}:before';
}
 
// Fields from module definition silently override keys from 
JSON files

-- 
To view, visit https://gerrit.wikimedia.org/r/395680
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0e8b6035f516e6629010b4f18471445c8833156e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revert "Support changing icon variants on hover"

[VolkerE (Code Review)]

Hello Bartosz Dziewoński, Jack Phoenix, Catrope, jenkins-bot,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/395680

to review the following change.


Change subject: Revert "Support changing icon variants on hover"
..

Revert "Support changing icon variants on hover"

This reverts commit 46c62ff5f474c6fe7a409863058e81bb678229b2. After 
reconsidering menu item treatment under UI Standardization perspective, we 
don't need and shouldn't use such pattern. 

Bug: T110051
Change-Id: I0e8b6035f516e6629010b4f18471445c8833156e
---
M resources/Resources.php
1 file changed, 15 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/80/395680/1

diff --git a/resources/Resources.php b/resources/Resources.php
index 94e3864..ae5b3f9 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1768,7 +1768,7 @@
'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',
+   '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',
),
'oojs-ui.styles.indicators' => array(
'class' => 'ResourceLoaderImageModule',
@@ -1785,98 +1785,98 @@
'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',
+   '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',
),
'oojs-ui.styles.icons-content' => array(
'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',
+   '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',
),
'oojs-ui.styles.icons-editing-advanced' => array(
'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',
+   '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',
),
'oojs-ui.styles.icons-editing-core' => array(
'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