From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Wed, 2 Mar 2016 19:27:52 +0000 (+0000)
Subject: Revert "Deprecating: Consolidating `progressive` & `constructive` buttons"
X-Git-Tag: 1.31.0-rc.0~7760^2
X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=ae0eb5fbe43e234313302a7bd93d8c0b68a1e9a0;p=lhc%2Fweb%2Fwiklou.git

Revert "Deprecating: Consolidating `progressive` & `constructive` buttons"

I merged it too early, sorry. Deployment is planned for a week later.

This reverts commit cb8fa5fd173f4cfdb9945019fa9ac894eafa3ffe.

Bug: T110555
Change-Id: I369fa6d2b4f6531f7ec475c08cba283d323a0ffb
---

diff --git a/resources/src/mediawiki.less/mediawiki.ui/mixins.less b/resources/src/mediawiki.less/mediawiki.ui/mixins.less
index 30b2eb5cb0..1b31956d8e 100644
--- a/resources/src/mediawiki.less/mediawiki.ui/mixins.less
+++ b/resources/src/mediawiki.less/mediawiki.ui/mixins.less
@@ -33,7 +33,7 @@
 // Button styling
 // ----------------------------------------------------------------------------
 
-.button-colors( @bgColor, @highlightColor, @activeColor ) {
+.button-colors(@bgColor, @highlightColor, @activeColor) {
 	background: @bgColor;
 
 	&:hover {
@@ -59,7 +59,7 @@
 	}
 }
 
-.button-colors( @bgColor, @highlightColor, @activeColor ) when ( lightness( @bgColor ) >= 70% ) {
+.button-colors(@bgColor, @highlightColor, @activeColor) when (lightness(@bgColor) >= 70%) {
 	color: @colorButtonText;
 	border: 1px solid @colorGray12;
 
@@ -86,7 +86,7 @@
 	}
 }
 
-.button-colors( @bgColor, @highlightColor, @activeColor ) when ( lightness( @bgColor ) < 70% ) {
+.button-colors(@bgColor, @highlightColor, @activeColor) when (lightness(@bgColor) < 70%) {
 	color: #fff;
 	// border of the same color as background so that light background and
 	// dark background buttons are the same height and width
@@ -106,7 +106,7 @@
 	}
 }
 
-.button-colors-quiet( @textColor, @highlightColor, @activeColor ) {
+.button-colors-quiet(@textColor, @highlightColor, @activeColor) {
 	// Quiet buttons all start gray, and reveal
 	// constructive/progressive/destructive color on hover and active.
 	color: @colorButtonText;
diff --git a/resources/src/mediawiki.ui/components/buttons.less b/resources/src/mediawiki.ui/components/buttons.less
index 37b8701e2a..4ffaeeee40 100644
--- a/resources/src/mediawiki.ui/components/buttons.less
+++ b/resources/src/mediawiki.ui/components/buttons.less
@@ -137,7 +137,7 @@
 		}
 	}
 
-	// Constructive buttons (deprecated, consolidated with `progressive` – see T110555)
+	// Constructive buttons
 	//
 	// Use constructive buttons for actions which result in a final action in the process that results
 	// in a change of state.
@@ -153,10 +153,10 @@
 	//
 	// Styleguide 2.1.2.
 	&.mw-ui-constructive {
-		.button-colors( @colorProgressive, @colorProgressiveHighlight, @colorProgressiveActive );
+		.button-colors( @colorConstructive, @colorConstructiveHighlight, @colorConstructiveActive );
 
 		&.mw-ui-quiet {
-			.button-colors-quiet( @colorProgressive, @colorProgressiveHighlight, @colorProgressiveActive );
+			.button-colors-quiet( @colorConstructive, @colorConstructiveHighlight, @colorConstructiveActive );
 		}
 	}