jenkins-bot has submitted this change and it was merged.
Change subject: MediaWiki Theme: Use white icons for disabled buttons
......................................................................
MediaWiki Theme: Use white icons for disabled buttons
Bug: T88483
Change-Id: I9f7e3df13a8c0793441274cb90c40514b7d8302d
---
M src/themes/mediawiki/MediaWikiTheme.js
M src/themes/mediawiki/elements.less
2 files changed, 6 insertions(+), 8 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/themes/mediawiki/MediaWikiTheme.js
b/src/themes/mediawiki/MediaWikiTheme.js
index cb2ce56..7197520 100644
--- a/src/themes/mediawiki/MediaWikiTheme.js
+++ b/src/themes/mediawiki/MediaWikiTheme.js
@@ -31,7 +31,7 @@
classes =
OO.ui.MediaWikiTheme.super.prototype.getElementClasses.call( this, element );
if ( element.supports( [ 'isFramed', 'isDisabled', 'hasFlag' ] ) ) {
- if ( !element.isDisabled() && element.isFramed() &&
element.hasFlag( 'primary' ) ) {
+ if ( element.isFramed() && ( element.isDisabled() ||
element.hasFlag( 'primary' ) ) ) {
variants.invert = true;
} else {
variants.progressive = element.hasFlag( 'progressive' );
diff --git a/src/themes/mediawiki/elements.less
b/src/themes/mediawiki/elements.less
index c60b8fb..69c9562 100644
--- a/src/themes/mediawiki/elements.less
+++ b/src/themes/mediawiki/elements.less
@@ -27,13 +27,6 @@
height: 1.9em;
}
- &.oo-ui-widget-disabled > .oo-ui-buttonElement-button {
- > .oo-ui-iconElement-icon,
- > .oo-ui-indicatorElement-indicator {
- opacity: 0.2;
- }
- }
-
&-frameless {
> .oo-ui-buttonElement-button {
&:hover,
@@ -76,6 +69,11 @@
&.oo-ui-widget-disabled > .oo-ui-buttonElement-button {
color: @disabled-text;
+
+ > .oo-ui-iconElement-icon,
+ > .oo-ui-indicatorElement-indicator {
+ opacity: 0.2;
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/189945
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9f7e3df13a8c0793441274cb90c40514b7d8302d
Gerrit-PatchSet: 5
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Prtksxna <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
