From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 18 Sep 2014 18:20:44 +0000 (+0000)
Subject: Merge "mediawiki.ui: Add @borderRadius variable to be used for inputs and buttons"
X-Git-Tag: 1.31.0-rc.0~13950
X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=ed9ee169d0fe11e128d0dabbbf4082a18a23b615;hp=5274c976fd2a77ef1a556dc791f8d433a2c13779;p=lhc%2Fweb%2Fwiklou.git

Merge "mediawiki.ui: Add @borderRadius variable to be used for inputs and buttons"
---

diff --git a/resources/src/mediawiki.less/mediawiki.ui/variables.less b/resources/src/mediawiki.less/mediawiki.ui/variables.less
index 17bf683df3..e91302bebe 100644
--- a/resources/src/mediawiki.less/mediawiki.ui/variables.less
+++ b/resources/src/mediawiki.less/mediawiki.ui/variables.less
@@ -57,3 +57,6 @@
 @colorGrayLight: #ccc;
 @colorGrayLighter: #ddd;
 @colorGrayLightest: #eee;
+
+// Global border radius to be used to buttons and inputs
+@borderRadius: 2px;
diff --git a/resources/src/mediawiki.ui/components/buttons.less b/resources/src/mediawiki.ui/components/buttons.less
index 8533c40517..bcb4532203 100644
--- a/resources/src/mediawiki.ui/components/buttons.less
+++ b/resources/src/mediawiki.ui/components/buttons.less
@@ -12,7 +12,6 @@
 //
 // Styleguide 2.
 
-@buttonBorderRadius: 3px;
 @transitionDuration: .1s;
 @transitionFunction: ease-in-out;
 
@@ -43,7 +42,7 @@
 
 	// Container styling
 	.button-colors(#FFF);
-	border-radius: @buttonBorderRadius;
+	border-radius: @borderRadius;
 	min-width: 80px;
 
 	// Ensure that buttons and inputs are nicely aligned when they have differing heights
@@ -216,8 +215,8 @@ a.mw-ui-button {
 	float: left;
 
 	&:first-child {
-		border-top-left-radius: @buttonBorderRadius;
-		border-bottom-left-radius: @buttonBorderRadius;
+		border-top-left-radius: @borderRadius;
+		border-bottom-left-radius: @borderRadius;
 	}
 
 	&:not(:first-child) {
@@ -225,7 +224,7 @@ a.mw-ui-button {
 	}
 
 	&:last-child{
-		border-top-right-radius: @buttonBorderRadius;
-		border-bottom-right-radius: @buttonBorderRadius;
+		border-top-right-radius: @borderRadius;
+		border-bottom-right-radius: @borderRadius;
 	}
 }
diff --git a/resources/src/mediawiki.ui/components/inputs.less b/resources/src/mediawiki.ui/components/inputs.less
index 77894b3157..1da42a45cf 100644
--- a/resources/src/mediawiki.ui/components/inputs.less
+++ b/resources/src/mediawiki.ui/components/inputs.less
@@ -35,6 +35,7 @@
 	padding: .4em .3em .2em .6em;
 	display: block;
 	vertical-align: middle;
+	border-radius: @borderRadius;
 	// Override user agent stylesheet properties. Instead use parent element.
 	color: inherit;
 	font-family: inherit;