From dd428d9fdf5231df2a1b1481dbec7d37cd0c063c Mon Sep 17 00:00:00 2001
From: S Page <spage@wikimedia.org>
Date: Tue, 23 Apr 2013 00:24:41 -0700
Subject: [PATCH] Don't repeat label styling

Only have one selector for .mw-ui-vform > div label , move all CSS to
that.

Bug: 47532
Change-Id: Ibd36f818865aa5ec99cc187bef983261485966d3
---
 resources/mediawiki.ui/mediawiki.ui.default.css       | 11 +++++++----
 resources/mediawiki.ui/mediawiki.ui.vector.css        | 11 +++++++----
 .../sourcefiles/scss/components/default/_forms.scss   |  4 ++--
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/resources/mediawiki.ui/mediawiki.ui.default.css b/resources/mediawiki.ui/mediawiki.ui.default.css
index 2568f5a789..c32f54bd68 100644
--- a/resources/mediawiki.ui/mediawiki.ui.default.css
+++ b/resources/mediawiki.ui/mediawiki.ui.default.css
@@ -142,9 +142,8 @@
   padding: 0;
   width: 100%;
 }
-/* line 28, sourcefiles/scss/components/default/_forms.scss */
+/* line 27, sourcefiles/scss/components/default/_forms.scss */
 .mw-ui-vform > div input,
-.mw-ui-vform > div label,
 .mw-ui-vform > div .mw-ui-button {
   display: block;
   -webkit-box-sizing: border-box;
@@ -153,7 +152,7 @@
   margin: 0;
   width: 100%;
 }
-/* line 35, sourcefiles/scss/components/default/_forms.scss */
+/* line 34, sourcefiles/scss/components/default/_forms.scss */
 .mw-ui-vform > div input {
   outline: 0;
   border-style: solid;
@@ -167,8 +166,12 @@
   box-shadow: #4091ed 0px 0px 5px;
   border-color: #4091ed;
 }
-/* line 39, sourcefiles/scss/components/default/_forms.scss */
+/* line 38, sourcefiles/scss/components/default/_forms.scss */
 .mw-ui-vform > div label {
+  display: block;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
   font-size: 0.9em;
   color: #7d7d7d;
   width: auto;
diff --git a/resources/mediawiki.ui/mediawiki.ui.vector.css b/resources/mediawiki.ui/mediawiki.ui.vector.css
index fd1ed473ce..5995439418 100644
--- a/resources/mediawiki.ui/mediawiki.ui.vector.css
+++ b/resources/mediawiki.ui/mediawiki.ui.vector.css
@@ -271,9 +271,8 @@
   padding: 0;
   width: 100%;
 }
-/* line 28, sourcefiles/scss/components/default/_forms.scss */
+/* line 27, sourcefiles/scss/components/default/_forms.scss */
 .mw-ui-vform > div input,
-.mw-ui-vform > div label,
 .mw-ui-vform > div .mw-ui-button {
   display: block;
   -webkit-box-sizing: border-box;
@@ -282,7 +281,7 @@
   margin: 0;
   width: 100%;
 }
-/* line 35, sourcefiles/scss/components/default/_forms.scss */
+/* line 34, sourcefiles/scss/components/default/_forms.scss */
 .mw-ui-vform > div input {
   outline: 0;
   border-style: solid;
@@ -296,8 +295,12 @@
   box-shadow: #4091ed 0px 0px 5px;
   border-color: #4091ed;
 }
-/* line 39, sourcefiles/scss/components/default/_forms.scss */
+/* line 38, sourcefiles/scss/components/default/_forms.scss */
 .mw-ui-vform > div label {
+  display: block;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
   font-size: 0.9em;
   color: #7d7d7d;
   width: auto;
diff --git a/resources/mediawiki.ui/sourcefiles/scss/components/default/_forms.scss b/resources/mediawiki.ui/sourcefiles/scss/components/default/_forms.scss
index 86a891ae61..8bbe3c2a8b 100644
--- a/resources/mediawiki.ui/sourcefiles/scss/components/default/_forms.scss
+++ b/resources/mediawiki.ui/sourcefiles/scss/components/default/_forms.scss
@@ -24,7 +24,6 @@ $defaultFormWidth: $captchaContainerWidth;
 
         // MW currently doesn't use the type attribute everywhere on inputs.
         input,
-        label,
         .mw-ui-button {
             display: block;
             @include box-sizing(border-box);
@@ -37,8 +36,9 @@ $defaultFormWidth: $captchaContainerWidth;
         }
 
         label {
+            display: block;
+            @include box-sizing(border-box);
             @include agora-label-styling;
-
             width: auto;
             margin: 0 0 0.2em 0;
             padding: 0;
-- 
2.20.1