From f32f9a911b9c24f8d7da7c85aa6df56d4e143f91 Mon Sep 17 00:00:00 2001
From: jdlrobson <jdlrobson@gmail.com>
Date: Fri, 11 Jul 2014 14:56:18 -0700
Subject: [PATCH] mediawiki.ui: One mixin file to rule them all

Change-Id: I10a78148c1c34d442c1655b6b3a0009aff3fdcc7
---
 .../{mixins/effects.less => mixins.less}      | 57 +++++++++++++++++++
 .../mediawiki.ui/mixins/forms.less            | 52 -----------------
 .../src/mediawiki.ui/components/buttons.less  |  2 +-
 .../src/mediawiki.ui/components/forms.less    |  2 +-
 4 files changed, 59 insertions(+), 54 deletions(-)
 rename resources/src/mediawiki.less/mediawiki.ui/{mixins/effects.less => mixins.less} (64%)
 delete mode 100644 resources/src/mediawiki.less/mediawiki.ui/mixins/forms.less

diff --git a/resources/src/mediawiki.less/mediawiki.ui/mixins/effects.less b/resources/src/mediawiki.less/mediawiki.ui/mixins.less
similarity index 64%
rename from resources/src/mediawiki.less/mediawiki.ui/mixins/effects.less
rename to resources/src/mediawiki.less/mediawiki.ui/mixins.less
index 9b62efe5dc..5c500d91a8 100644
--- a/resources/src/mediawiki.less/mediawiki.ui/mixins/effects.less
+++ b/resources/src/mediawiki.less/mediawiki.ui/mixins.less
@@ -1,3 +1,60 @@
+// ----------------------------------------------------------------------------
+// Form styling mixins
+// ----------------------------------------------------------------------------
+
+// Font is not included.
+// For Vector, that should be layered on top with vector-type
+.agora-field-styling() {
+
+	border: 1px solid @colorGrayLight;
+
+	&:focus {
+		// Styling focus of native checkboxes etc on Mac is almost impossible.
+		&:not([type=checkbox]):not([type=radio]) {
+			outline: 0; // Removes OS field focus
+		}
+
+		box-shadow: @colorProgressiveShadow 0 0 5px;
+
+		border-color: @colorProgressiveShadow;
+	}
+
+	color: @colorText;
+	padding: 0.35em 0.5em 0.35em 0.5em;
+
+	// Ensure that buttons and inputs are nicely aligned when they have differing heights
+	vertical-align: middle;
+}
+
+.agora-label-styling() {
+	//font-weight: bold;
+	font-size: 0.9em;
+	color: darken(@colorGrayLight, 50%);
+
+	* {
+		font-weight: normal;
+	}
+}
+
+.agora-inline-label-styling() {
+	margin-bottom: 0.5em;
+	cursor: pointer;
+	vertical-align: bottom;
+	line-height: normal;
+
+	font-weight: normal;
+
+	& > input[type="checkbox"],
+	& > input[type="radio"] {
+		width: auto;
+		height: auto;
+		margin: 0 0.1em 0 0;
+		padding: 0;
+		border: 1px solid @colorGrayLight;
+		cursor: pointer;
+	}
+}
+
 // ----------------------------------------------------------------------------
 // Button styling
 // ----------------------------------------------------------------------------
diff --git a/resources/src/mediawiki.less/mediawiki.ui/mixins/forms.less b/resources/src/mediawiki.less/mediawiki.ui/mixins/forms.less
deleted file mode 100644
index 7258d30aac..0000000000
--- a/resources/src/mediawiki.less/mediawiki.ui/mixins/forms.less
+++ /dev/null
@@ -1,52 +0,0 @@
-// Font is not included.
-// For Vector, that should be layered on top with vector-type
-.agora-field-styling() {
-
-	border: 1px solid @colorGrayLight;
-
-	&:focus {
-		// Styling focus of native checkboxes etc on Mac is almost impossible.
-		&:not([type=checkbox]):not([type=radio]) {
-			outline: 0; // Removes OS field focus
-		}
-
-		box-shadow: @colorProgressiveShadow 0 0 5px;
-
-		border-color: @colorProgressiveShadow;
-	}
-
-	color: @colorText;
-	padding: 0.35em 0.5em 0.35em 0.5em;
-
-	// Ensure that buttons and inputs are nicely aligned when they have differing heights
-	vertical-align: middle;
-}
-
-.agora-label-styling() {
-	//font-weight: bold;
-	font-size: 0.9em;
-	color: darken(@colorGrayLight, 50%);
-
-	* {
-		font-weight: normal;
-	}
-}
-
-.agora-inline-label-styling() {
-	margin-bottom: 0.5em;
-	cursor: pointer;
-	vertical-align: bottom;
-	line-height: normal;
-
-	font-weight: normal;
-
-	& > input[type="checkbox"],
-	& > input[type="radio"] {
-		width: auto;
-		height: auto;
-		margin: 0 0.1em 0 0;
-		padding: 0;
-		border: 1px solid @colorGrayLight;
-		cursor: pointer;
-	}
-}
diff --git a/resources/src/mediawiki.ui/components/buttons.less b/resources/src/mediawiki.ui/components/buttons.less
index e5495ba4d9..ec08413ae4 100644
--- a/resources/src/mediawiki.ui/components/buttons.less
+++ b/resources/src/mediawiki.ui/components/buttons.less
@@ -1,6 +1,6 @@
 @import "mediawiki.mixins";
 @import "mediawiki.ui/variables";
-@import "mediawiki.ui/mixins/effects";
+@import "mediawiki.ui/mixins";
 
 // Buttons
 //
diff --git a/resources/src/mediawiki.ui/components/forms.less b/resources/src/mediawiki.ui/components/forms.less
index bb914801c4..2e586a6b80 100644
--- a/resources/src/mediawiki.ui/components/forms.less
+++ b/resources/src/mediawiki.ui/components/forms.less
@@ -2,7 +2,7 @@
 
 @import "mediawiki.mixins";
 @import "mediawiki.ui/variables";
-@import "mediawiki.ui/mixins/forms";
+@import "mediawiki.ui/mixins";
 
 // --------------------------------------------------------------------------
 // Layouts
-- 
2.20.1