From: Ed Sanders <esanders@wikimedia.org>
Date: Fri, 8 Feb 2019 14:13:03 +0000 (+0000)
Subject: Fix mw-ui-quiet+progressive/destructive selectors
X-Git-Tag: 1.34.0-rc.0~2896^2
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=e8a87bc32eeede393dd0025952cfcc7f399666c4;p=lhc%2Fweb%2Fwiklou.git

Fix mw-ui-quiet+progressive/destructive selectors

Bonus: Fix color of disabled button text

Bug: T215610
Change-Id: I6e38355b46d87920605604beb0141cf097efab08
---

diff --git a/resources/src/mediawiki.less/mediawiki.ui/variables.less b/resources/src/mediawiki.less/mediawiki.ui/variables.less
index 0d1a657391..6a75db05e4 100644
--- a/resources/src/mediawiki.less/mediawiki.ui/variables.less
+++ b/resources/src/mediawiki.less/mediawiki.ui/variables.less
@@ -63,7 +63,7 @@
 @colorButtonText: @colorGray2;
 @colorButtonTextHighlight: @colorGray4;
 @colorButtonTextActive: @colorGray1;
-@colorDisabledText: @colorGray12;
+@colorDisabledText: @colorGray7;
 @colorErrorText: #d33;
 @colorWarningText: #705000;
 
diff --git a/resources/src/mediawiki.ui/components/buttons.less b/resources/src/mediawiki.ui/components/buttons.less
index b7175d0652..ac7a2259e0 100644
--- a/resources/src/mediawiki.ui/components/buttons.less
+++ b/resources/src/mediawiki.ui/components/buttons.less
@@ -127,9 +127,7 @@
 		box-shadow: none;
 	}
 
-	&:disabled,
-	&.mw-ui-quiet.mw-ui-progressive,
-	&.mw-ui-quiet.mw-ui-destructive {
+	&:disabled {
 		background-color: @colorGray12;
 		color: @colorBaseInverted;
 		border-color: @colorGray12;
@@ -176,7 +174,9 @@
 	// </div>
 	//
 	// Styleguide 2.1.1.
-	&.mw-ui-quiet {
+	&.mw-ui-quiet,
+	&.mw-ui-quiet.mw-ui-progressive,
+	&.mw-ui-quiet.mw-ui-destructive {
 		background-color: transparent;
 		// Quiet buttons all start gray, and reveal
 		// progressive/destructive color on hover and active.
@@ -203,7 +203,9 @@
 			box-shadow: none;
 		}
 
-		&:disabled {
+		&:disabled,
+		&:disabled:hover,
+		&:disabled:active {
 			background-color: transparent;
 			color: @colorDisabledText;
 			border-color: transparent;