From 7b60470e9b6e159205be5f5a38260ef5756d8569 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sat, 22 Feb 2014 14:16:11 -0800
Subject: Fixes #12801: Add padding to the bottom of .form-control-static to
 match height of standard form controls

---
 less/forms.less | 1 +
 1 file changed, 1 insertion(+)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index f607b8509..24cb0da69 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -418,6 +418,7 @@ input[type="checkbox"],
 
   .form-control-static {
     padding-top: (@padding-base-vertical + 1);
+    padding-bottom: (@padding-base-vertical + 1);
   }
 
   // Only right align form labels here when the columns stop stacking
-- 
cgit v1.2.3


From 754791e3d9b67fd71b6a1250f93ea9723b68e221 Mon Sep 17 00:00:00 2001
From: Chris Rebert <github@rebertia.com>
Date: Mon, 24 Feb 2014 14:43:09 -0800
Subject: fix #12836

Thanks @Quy.
---
 less/forms.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 24cb0da69..8c90e4fdf 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -51,7 +51,7 @@ input[type="search"] {
 input[type="radio"],
 input[type="checkbox"] {
   margin: 4px 0 0;
-  margin-top: 1px \9; /* IE8-9 */
+  margin-top: 1px \9; // IE8-9
   line-height: normal;
 }
 
-- 
cgit v1.2.3


From 7733f2437316c2ae10e669a50771646ae8b8e927 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Tue, 4 Mar 2014 14:12:57 -0800
Subject: Fixes #12868: Enables icon feedback on validation states for
 large/small inputs.

Also reorders the CSS to place Glyhpicons as a dependency before other components for fewer overrides and less specific CSS.
---
 less/forms.less | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 8c90e4fdf..273e36608 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -271,18 +271,27 @@ input[type="checkbox"],
   .form-control {
     padding-right: (@input-height-base * 1.25);
   }
-
-  // Feedback icon (requires .glyphicon classes)
-  .form-control-feedback {
-    position: absolute;
-    top: (@line-height-computed + 5); // Height of the `label` and its margin
-    right: 0;
-    display: block;
-    width: @input-height-base;
-    height: @input-height-base;
-    line-height: @input-height-base;
-    text-align: center;
-  }
+}
+// Feedback icon (requires .glyphicon classes)
+.form-control-feedback {
+  position: absolute;
+  top: (@line-height-computed + 5); // Height of the `label` and its margin
+  right: 0;
+  display: block;
+  width: @input-height-base;
+  height: @input-height-base;
+  line-height: @input-height-base;
+  text-align: center;
+}
+.input-lg + .form-control-feedback {
+  width: @input-height-large;
+  height: @input-height-large;
+  line-height: @input-height-large;
+}
+.input-sm + .form-control-feedback {
+  width: @input-height-small;
+  height: @input-height-small;
+  line-height: @input-height-small;
 }
 
 // Feedback states
-- 
cgit v1.2.3