From: Volker E <volker.e@wikimedia.org>
Date: Tue, 9 Feb 2016 02:51:40 +0000 (-0800)
Subject: Deprecating: Consolidating `progressive` & `constructive` buttons
X-Git-Tag: 1.31.0-rc.0~7684^2
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=358b2b04b4bbd739964f40536cdd7610cb237dea;p=lhc%2Fweb%2Fwiklou.git

Deprecating: Consolidating `progressive` & `constructive` buttons

Consolidating `progressive` and `constructive` buttons and deprecating
`contructive` button usage. Also aligning Less button mixins to CSS/Less
coding guidelines.

Bug: T110555
Change-Id: I095eddfe5ec2f1fbc81939b67ed467484e15092b
---

diff --git a/resources/src/mediawiki.less/mediawiki.ui/mixins.less b/resources/src/mediawiki.less/mediawiki.ui/mixins.less
index 1b31956d8e..30b2eb5cb0 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 71febe3a45..3470f225ea 100644
--- a/resources/src/mediawiki.ui/components/buttons.less
+++ b/resources/src/mediawiki.ui/components/buttons.less
@@ -138,7 +138,7 @@
 		}
 	}
 
-	// Constructive buttons
+	// Constructive buttons (deprecated, consolidated with `progressive` – see T110555)
 	//
 	// Use constructive buttons for actions which result in a final action in the process that results
 	// in a change of state.
@@ -154,10 +154,10 @@
 	//
 	// Styleguide 2.1.2.
 	&.mw-ui-constructive {
-		.button-colors( @colorConstructive, @colorConstructiveHighlight, @colorConstructiveActive );
+		.button-colors( @colorProgressive, @colorProgressiveHighlight, @colorProgressiveActive );
 
 		&.mw-ui-quiet {
-			.button-colors-quiet( @colorConstructive, @colorConstructiveHighlight, @colorConstructiveActive );
+			.button-colors-quiet( @colorProgressive, @colorProgressiveHighlight, @colorProgressiveActive );
 		}
 	}