jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348098 )
Change subject: MenuOptionWidget: Remove theme-independent 'check' icon
......................................................................
MenuOptionWidget: Remove theme-independent 'check' icon
A 'check' icon was added to any MenuOptionWidgets independent of the
chosen theme, but it was only shown in Apex. Instead removing it per
default and adding it back in Apex through a CSS hack.
The hack has to replicate a bunch of CSS rules from IconElement and
DecoratedOptionWidget. It is needed because while an icon is added
per CSS only the parent element does not get the `.oo-ui-iconElement`
class.
Also removing the CSS workaround in MediaWiki theme to hide default,
unwanted 'check' icons in the MenuOptionWidget (T101560) and adding demo.
Bug: T87835
Bug: T101560
Change-Id: If34ab5302767b8505650a079b033af5506e5cb27
---
M demos/pages/widgets.js
M src/styles/widgets/MenuOptionWidget.less
M src/themes/apex/widgets.less
M src/themes/mediawiki/widgets.less
M src/widgets/MenuOptionWidget.js
5 files changed, 17 insertions(+), 20 deletions(-)
Approvals:
jenkins-bot: Verified
VolkerE: Looks good to me, approved
diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index 6009ee1..71efd2d 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -996,8 +996,9 @@
label:
'The fourth option has a long label'
} ),
new
OO.ui.MenuOptionWidget( {
+ icon:
'feedback',
data:
'd',
- label:
'Fifth'
+ label:
'The fifth option has an icon'
} )
]
}
diff --git a/src/styles/widgets/MenuOptionWidget.less
b/src/styles/widgets/MenuOptionWidget.less
index 10556e0..ad62ee2 100644
--- a/src/styles/widgets/MenuOptionWidget.less
+++ b/src/styles/widgets/MenuOptionWidget.less
@@ -1,17 +1,5 @@
@import '../common';
.oo-ui-menuOptionWidget {
- .oo-ui-iconElement-icon {
- display: none;
- }
-
- &.oo-ui-optionWidget {
- &-selected {
- .oo-ui-iconElement-icon {
- display: block;
- }
- }
- }
-
.theme-oo-ui-menuOptionWidget();
}
diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less
index 178c2c1..a3a709b 100644
--- a/src/themes/apex/widgets.less
+++ b/src/themes/apex/widgets.less
@@ -407,6 +407,21 @@
&.oo-ui-optionWidget {
&-selected {
background-color: transparent;
+
+ // Hack to show 'check' icon in Apex, see T87835
+ .oo-ui-iconElement-icon {
+ .oo-ui-background-image-svg(
'@{oo-ui-default-image-path}/icons/check' );
+ background-position: center center;
+ background-repeat: no-repeat;
+ background-size: contain;
+ display: block;
+ left: 0.5em;
+ top: 0;
+ min-width: @size-icon-min;
+ width: 1.875em;
+ min-height: @size-icon-min;
+ height: 100%;
+ }
}
&-highlighted,
&-highlighted.oo-ui-optionWidget-selected {
diff --git a/src/themes/mediawiki/widgets.less
b/src/themes/mediawiki/widgets.less
index 5bab5a1..9e4f13b 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -750,10 +750,6 @@
&-selected {
background-color: @background-color-progressive;
color: @color-progressive;
-
- .oo-ui-iconElement-icon {
- display: none;
- }
}
&-selected&-highlighted,
&-pressed&-highlighted {
diff --git a/src/widgets/MenuOptionWidget.js b/src/widgets/MenuOptionWidget.js
index 1ee67c6..427d1f3 100644
--- a/src/widgets/MenuOptionWidget.js
+++ b/src/widgets/MenuOptionWidget.js
@@ -12,9 +12,6 @@
* @param {Object} [config] Configuration options
*/
OO.ui.MenuOptionWidget = function OoUiMenuOptionWidget( config ) {
- // Configuration initialization
- config = $.extend( { icon: 'check' }, config );
-
// Parent constructor
OO.ui.MenuOptionWidget.parent.call( this, config );
--
To view, visit https://gerrit.wikimedia.org/r/348098
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If34ab5302767b8505650a079b033af5506e5cb27
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna <[email protected]>
Gerrit-Reviewer: VolkerE <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
