From b7b84c7a0dfaad5134258b5a50e8d42bd0656b81 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Thu, 22 Mar 2012 17:36:32 -0700
Subject: remove bug in docs for example icon in an input-prepend by removing
 margin on any input/select/etc in an input-prepend/append

---
 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 8d9c25308..a53b273b9 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -365,6 +365,7 @@ select:focus:required:invalid {
   input,
   select,
   .uneditable-input {
+    margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
     *margin-left: 0;
     .border-radius(0 3px 3px 0);
     &:focus {
-- 
cgit v1.2.3


From edca6f28f0ae78cdc3dbfe0ce5183153830a77ee Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Thu, 22 Mar 2012 17:41:20 -0700
Subject: fix #2718, misaligned uneditable inputs in prepends/appends

---
 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 a53b273b9..ffd198372 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -321,7 +321,6 @@ select:focus:required:invalid {
 
 // For text that needs to appear as an input but should not be an input
 .uneditable-input {
-  display: block;
   background-color: @inputBackground;
   border-color: #eee;
   .box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
@@ -367,6 +366,7 @@ select:focus:required:invalid {
   .uneditable-input {
     margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
     *margin-left: 0;
+    vertical-align: middle;
     .border-radius(0 3px 3px 0);
     &:focus {
       position: relative;
-- 
cgit v1.2.3


From 1852d077bfa15308808c470a031f6e6b5c3dc8d2 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Thu, 22 Mar 2012 21:08:41 -0700
Subject: add shell of tests page, lighten form actions background and give it
 a variable

---
 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 ffd198372..5ce8b0c1c 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -314,7 +314,7 @@ select:focus:required:invalid {
   padding: (@baseLineHeight - 1) 20px @baseLineHeight;
   margin-top: @baseLineHeight;
   margin-bottom: @baseLineHeight;
-  background-color: @grayLighter;
+  background-color: @formActionsBackground;
   border-top: 1px solid #ddd;
   .clearfix(); // Adding clearfix to allow for .pull-right button containers
 }
-- 
cgit v1.2.3


From f330de0b5c506267dcee917c23844697ee56230d Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Fri, 23 Mar 2012 00:51:31 -0700
Subject: add comment for append/prepend z-indexing

---
 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 5ce8b0c1c..83e1013bf 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -368,6 +368,7 @@ select:focus:required:invalid {
     *margin-left: 0;
     vertical-align: middle;
     .border-radius(0 3px 3px 0);
+    // Make input on top when focused so blue border and shadow always show
     &:focus {
       position: relative;
       z-index: 2;
-- 
cgit v1.2.3


From 0b4198492002e8aeff6a9106f62c140c82c6c75e Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Fri, 23 Mar 2012 09:47:57 -0700
Subject: Fix #2758: Uneditable inputs in input-prepend/append

1. Added a missing comma to the input-append's form control stack () to fix border-radius
2. Add  to the .uneditable-input in forms to remove the float as we do with all other form controls
---
 less/forms.less | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 83e1013bf..af1c7eecc 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -243,7 +243,7 @@ select:focus {
 input[class*="span"],
 select[class*="span"],
 textarea[class*="span"],
-.uneditable-input {
+.uneditable-input[class*="span"] {
   float: none;
   margin-left: 0;
 }
@@ -408,7 +408,7 @@ select:focus:required:invalid {
 }
 .input-append {
   input,
-  select
+  select,
   .uneditable-input {
     .border-radius(3px 0 0 3px);
   }
-- 
cgit v1.2.3


From c7afe382a26834cce5b8bf2fc7333ce7e945a2d4 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Fri, 23 Mar 2012 20:56:04 -0700
Subject: fix other instances of mixins, swap use of box-shadow everywhere,
 include border-radius and transition

---
 less/forms.less | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 8d9c25308..5e373956b 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -213,8 +213,8 @@ textarea {
 input:focus,
 textarea:focus {
   border-color: rgba(82,168,236,.8);
-  @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
-  .box-shadow(@shadow);
+  .box-shadow(inset 0 1px 1px rgba(0,0,0,.075),
+              0 0 8px rgba(82,168,236,.6));
   outline: 0;
   outline: thin dotted \9; /* IE6-9 */
 }
-- 
cgit v1.2.3


From a5552a1d700a1caa2d87ea4bbccc59205b6e72f9 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sun, 25 Mar 2012 12:42:47 -0700
Subject: revert bart's mixin fix

---
 less/forms.less | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index e21845834..2164fe0ee 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -213,8 +213,9 @@ textarea {
 input:focus,
 textarea:focus {
   border-color: rgba(82,168,236,.8);
-  .box-shadow(inset 0 1px 1px rgba(0,0,0,.075),
-              0 0 8px rgba(82,168,236,.6));
+  @shadow: inset 0 1px 1px rgba(0,0,0,.075),
+           0 0 8px rgba(82,168,236,.6);
+  .box-shadow(@shadow);
   outline: 0;
   outline: thin dotted \9; /* IE6-9 */
 }
-- 
cgit v1.2.3


From d0526e31fa291bd1ef943081ff7248e734edccb7 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sun, 25 Mar 2012 14:31:04 -0700
Subject: remove padding on .search-query for IE7-8 since it doesn't pick up
 large border-radius

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

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 2164fe0ee..4f99cce8d 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -450,6 +450,8 @@ select:focus:required:invalid {
 .search-query {
   padding-left: 14px;
   padding-right: 14px;
+  padding-left: 4px \9; /* IE7-8 doesn't have border-radius, so don't indent the padding */
+  padding-right: 4px \9;
   margin-bottom: 0; // remove the default margin on all inputs
   .border-radius(14px);
 }
-- 
cgit v1.2.3


From cbd77d0aeba4b4105dfcc51dc1298a0d00452869 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sun, 25 Mar 2012 14:37:19 -0700
Subject: give IE7 inline-block behavior for input-prepend/append

---
 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 4f99cce8d..72903faa2 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -475,6 +475,7 @@ select:focus:required:invalid {
   .input-prepend,
   .input-append {
     display: inline-block;
+    .ie7-inline-block();
     margin-bottom: 0;
   }
   // Re-hide hidden elements due to specifity
-- 
cgit v1.2.3


From 4c3e7690ba8b85b08c78344fb62cdef645d23093 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sun, 25 Mar 2012 14:46:47 -0700
Subject: jankify the IE7 horizontal forms a bit more to account for no labels
 before .controls, per #2728

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

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 72903faa2..6c7faf0e2 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -548,6 +548,9 @@ legend + .control-group {
     *display: inline-block;
     *margin-left: 0;
     *padding-left: 20px;
+    &:first-child {
+      *padding-left: 160px;
+    }
   }
   // Remove bottom margin on block level help text since that's accounted for on .control-group
   .help-block {
-- 
cgit v1.2.3


From 3308d1968f37eb81ef1578a409742e93813a8492 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Wed, 28 Mar 2012 18:18:41 -0700
Subject: fix #2846: Firefox required two clicks on selects to get to options
 dropdown

---
 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 6c7faf0e2..a57732c13 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -365,13 +365,13 @@ select:focus:required:invalid {
   input,
   select,
   .uneditable-input {
+    position: relative; // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness
     margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
     *margin-left: 0;
     vertical-align: middle;
     .border-radius(0 3px 3px 0);
     // Make input on top when focused so blue border and shadow always show
     &:focus {
-      position: relative;
       z-index: 2;
     }
   }
-- 
cgit v1.2.3


From 2355fd224ddcd571765c5ad2f2242dac65789aa4 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sat, 31 Mar 2012 21:06:16 -0700
Subject: remove @shadow instances and replace with escaped values, update
 mixins to not use a default value at all

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

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index a57732c13..1945bda60 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -213,9 +213,7 @@ textarea {
 input:focus,
 textarea:focus {
   border-color: rgba(82,168,236,.8);
-  @shadow: inset 0 1px 1px rgba(0,0,0,.075),
-           0 0 8px rgba(82,168,236,.6);
-  .box-shadow(@shadow);
+  .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
   outline: 0;
   outline: thin dotted \9; /* IE6-9 */
 }
-- 
cgit v1.2.3


From 2ea437f353a636a277320513db04ced4fc0f7da2 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 2 Apr 2012 22:49:19 -0700
Subject: fix #2908: unfloat inputs using .span* in fluid row

---
 less/forms.less | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 1945bda60..240de5ed2 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -242,7 +242,12 @@ select:focus {
 input[class*="span"],
 select[class*="span"],
 textarea[class*="span"],
-.uneditable-input[class*="span"] {
+.uneditable-input[class*="span"],
+// Redeclare since the fluid row class is more specific
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"] {
   float: none;
   margin-left: 0;
 }
-- 
cgit v1.2.3


From fedce0cec70a56713f95d36585f9e3adaad2c332 Mon Sep 17 00:00:00 2001
From: Arnold Daniels <arnold@adaniels.nl>
Date: Thu, 5 Apr 2012 23:08:32 +0300
Subject: Allow multiple buttons in `.input-prepend` and `.input-append`. This
 has a look similar to button groups.

---
 less/forms.less | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 8d9c25308..1da8d7500 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -391,7 +391,7 @@ select:focus:required:invalid {
   }
   .add-on,
   .btn {
-    .border-radius(3px 0 0 3px);
+    .border-radius(0);
   }
   .active {
     background-color: lighten(@green, 30);
@@ -403,6 +403,10 @@ select:focus:required:invalid {
   .btn {
     margin-right: -1px;
   }
+  .add-on:first-child,
+  .btn:first-child {
+    .border-radius(3px 0 0 3px);
+  }
 }
 .input-append {
   input,
@@ -417,6 +421,9 @@ select:focus:required:invalid {
   .add-on,
   .btn {
     margin-left: -1px;
+  }
+  .add-on:last-child,
+  .btn:last-child {
     .border-radius(0 3px 3px 0);
   }
 }
-- 
cgit v1.2.3


From 0a71f171bc63dcfea42fe002bab00454d728fc42 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sat, 7 Apr 2012 16:17:15 -0700
Subject: readd bootstrap.zip, add @inputBorderRadius var to close #2946

---
 less/forms.less | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 240de5ed2..d8cb54909 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -72,7 +72,7 @@ select,
   line-height: @baseLineHeight;
   color: @gray;
   border: 1px solid @inputBorder;
-  .border-radius(3px);
+  .border-radius(@inputBorderRadius);
 }
 .uneditable-textarea {
   width: auto;
@@ -372,7 +372,7 @@ select:focus:required:invalid {
     margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
     *margin-left: 0;
     vertical-align: middle;
-    .border-radius(0 3px 3px 0);
+    .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
     // Make input on top when focused so blue border and shadow always show
     &:focus {
       z-index: 2;
@@ -397,7 +397,7 @@ select:focus:required:invalid {
   }
   .add-on,
   .btn {
-    .border-radius(3px 0 0 3px);
+    .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
   }
   .active {
     background-color: lighten(@green, 30);
@@ -414,7 +414,7 @@ select:focus:required:invalid {
   input,
   select,
   .uneditable-input {
-    .border-radius(3px 0 0 3px);
+    .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
   }
   .uneditable-input {
     border-left-color: #eee;
@@ -423,7 +423,7 @@ select:focus:required:invalid {
   .add-on,
   .btn {
     margin-left: -1px;
-    .border-radius(0 3px 3px 0);
+    .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
   }
 }
 // Remove all border-radius for inputs with both prepend and append
@@ -436,12 +436,12 @@ select:focus:required:invalid {
   .add-on:first-child,
   .btn:first-child {
     margin-right: -1px;
-    .border-radius(3px 0 0 3px);
+    .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
   }
   .add-on:last-child,
   .btn:last-child {
     margin-left: -1px;
-    .border-radius(0 3px 3px 0);
+    .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
   }
 }
 
-- 
cgit v1.2.3


From a7d8145a321036e39a91fc9648710e62f7f164ac Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sat, 14 Apr 2012 13:18:37 -0700
Subject: fix #3036: add bg color to inputs

---
 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 60eff0043..dafe1c5c3 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -71,6 +71,7 @@ select,
   font-size: @baseFontSize;
   line-height: @baseLineHeight;
   color: @gray;
+  background-color: @inputBackground;
   border: 1px solid @inputBorder;
   .border-radius(@inputBorderRadius);
 }
-- 
cgit v1.2.3


From 16855b920e05b86aa7c54bfef050f1a81e5526cc Mon Sep 17 00:00:00 2001
From: au-phiware <corin@phiware.com.au>
Date: Sun, 15 Apr 2012 12:31:07 +1000
Subject: Silence comment (just like the others)

---
 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 8d9c25308..60b216971 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -538,7 +538,7 @@ legend + .control-group {
   // Move over all input controls and content
   .controls {
     margin-left: 160px;
-    /* Super jank IE7 fix to ensure the inputs in .input-append and input-prepend don't inherit the margin of the parent, in this case .controls */
+    // Super jank IE7 fix to ensure the inputs in .input-append and input-prepend don't inherit the margin of the parent, in this case .controls
     *display: inline-block;
     *margin-left: 0;
     *padding-left: 20px;
-- 
cgit v1.2.3


From 9e9be2dc0db5148e14a9fe2164dafd79c7dd71cd Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sat, 14 Apr 2012 23:19:42 -0700
Subject: fix #2989: clear .checkbox/.radio floats

---
 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 1367b1fd9..dd18b91f5 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -172,6 +172,7 @@ input[type="hidden"] {
 // Indent the labels to position radios/checkboxes as hanging
 .radio,
 .checkbox {
+  overflow: auto; // clear the floating input if there is no label text
   padding-left: 18px;
 }
 .radio input[type="radio"],
-- 
cgit v1.2.3


From 13e4d1d5ac90484c09ecb1a98e540309d043a6f7 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sun, 15 Apr 2012 00:35:30 -0700
Subject: fix #2990: text wrapping in .uneditable-input

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

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index dd18b91f5..409de0a24 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -331,6 +331,9 @@ select:focus:required:invalid {
   border-color: #eee;
   .box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
   cursor: not-allowed;
+  // prevent text from wrapping, but still cut it off like an input does
+  overflow: hidden;
+  white-space: nowrap;
 }
 
 // Placeholder text gets special styles; can't be bundled together though for some reason
-- 
cgit v1.2.3


From 2881269e16be1beb007633501496d6a8e8924b4b Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Mon, 16 Apr 2012 16:34:08 -0700
Subject: lots of property ordering

---
 less/forms.less | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 409de0a24..eb3be4544 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -98,8 +98,8 @@ input[type="radio"] {
   *margin-top: 0; /* IE7 */
   line-height: normal;
   cursor: pointer;
-  .border-radius(0);
   border: 0 \9; /* IE9 and down */
+  .border-radius(0);
 }
 input[type="image"] {
   border: 0;
@@ -110,9 +110,9 @@ input[type="file"] {
   width: auto;
   padding: initial;
   line-height: initial;
-  border: initial;
   background-color: @inputBackground;
   background-color: initial;
+  border: initial;
   .box-shadow(none);
 }
 
@@ -172,8 +172,8 @@ input[type="hidden"] {
 // Indent the labels to position radios/checkboxes as hanging
 .radio,
 .checkbox {
-  overflow: auto; // clear the floating input if there is no label text
   padding-left: 18px;
+  overflow: auto; // clear the floating input if there is no label text
 }
 .radio input[type="radio"],
 .checkbox input[type="checkbox"] {
@@ -215,16 +215,16 @@ textarea {
 input:focus,
 textarea:focus {
   border-color: rgba(82,168,236,.8);
-  .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
   outline: 0;
   outline: thin dotted \9; /* IE6-9 */
+  .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
 }
 input[type="file"]:focus,
 input[type="radio"]:focus,
 input[type="checkbox"]:focus,
 select:focus {
-  .box-shadow(none); // override for file inputs
   .tab-focus();
+  .box-shadow(none); // override for file inputs
 }
 
 
@@ -274,9 +274,9 @@ textarea[disabled],
 input[readonly],
 select[readonly],
 textarea[readonly] {
+  cursor: not-allowed;
   background-color: @inputDisabledBackground;
   border-color: #ddd;
-  cursor: not-allowed;
 }
 
 
@@ -327,13 +327,12 @@ select:focus:required:invalid {
 
 // For text that needs to appear as an input but should not be an input
 .uneditable-input {
+  overflow: hidden; // prevent text from wrapping, but still cut it off like an input does
+  white-space: nowrap;
+  cursor: not-allowed;
   background-color: @inputBackground;
   border-color: #eee;
   .box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
-  cursor: not-allowed;
-  // prevent text from wrapping, but still cut it off like an input does
-  overflow: hidden;
-  white-space: nowrap;
 }
 
 // Placeholder text gets special styles; can't be bundled together though for some reason
@@ -389,8 +388,8 @@ select:focus:required:invalid {
   .add-on {
     display: inline-block;
     width: auto;
-    min-width: 16px;
     height: @baseLineHeight;
+    min-width: 16px;
     padding: 4px 5px;
     font-weight: normal;
     line-height: @baseLineHeight;
@@ -427,8 +426,8 @@ select:focus:required:invalid {
     .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
   }
   .uneditable-input {
-    border-left-color: #eee;
     border-right-color: #ccc;
+    border-left-color: #eee;
   }
   .add-on:last-child,
   .btn:last-child {
@@ -460,10 +459,10 @@ select:focus:required:invalid {
 // -----------
 
 .search-query {
-  padding-left: 14px;
   padding-right: 14px;
-  padding-left: 4px \9; /* IE7-8 doesn't have border-radius, so don't indent the padding */
   padding-right: 4px \9;
+  padding-left: 14px;
+  padding-left: 4px \9; /* IE7-8 doesn't have border-radius, so don't indent the padding */
   margin-bottom: 0; // remove the default margin on all inputs
   .border-radius(14px);
 }
@@ -521,8 +520,8 @@ select:focus:required:invalid {
 .form-inline .radio input[type="radio"],
 .form-inline .checkbox input[type="checkbox"] {
   float: left;
-  margin-left: 0;
   margin-right: 3px;
+  margin-left: 0;
 }
 
 
@@ -555,11 +554,12 @@ legend + .control-group {
   }
   // Move over all input controls and content
   .controls {
-    margin-left: 160px;
-    // Super jank IE7 fix to ensure the inputs in .input-append and input-prepend don't inherit the margin of the parent, in this case .controls
+    // Super jank IE7 fix to ensure the inputs in .input-append and input-prepend
+    // don't inherit the margin of the parent, in this case .controls
     *display: inline-block;
-    *margin-left: 0;
     *padding-left: 20px;
+    margin-left: 160px;
+    *margin-left: 0;
     &:first-child {
       *padding-left: 160px;
     }
-- 
cgit v1.2.3


From 99a916d5ebfdf5199be0232ac8bf6d569f54f07c Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 23 Apr 2012 03:05:10 -0700
Subject: remove background color from radios and checkboxes for IEs

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

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index eb3be4544..da94fa1fa 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -98,6 +98,7 @@ input[type="radio"] {
   *margin-top: 0; /* IE7 */
   line-height: normal;
   cursor: pointer;
+  background-color: transparent;
   border: 0 \9; /* IE9 and down */
   .border-radius(0);
 }
@@ -278,6 +279,13 @@ textarea[readonly] {
   background-color: @inputDisabledBackground;
   border-color: #ddd;
 }
+// Explicitly reset the colors here
+input[type="radio"][disabled],
+input[type="checkbox"][disabled],
+input[type="radio"][readonly],
+input[type="checkbox"][readonly] {
+  background-color: transparent;
+}
 
 
 
-- 
cgit v1.2.3


From 805ca03457661d6e354c308bb98e7e985f8ca79f Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Tue, 24 Apr 2012 01:33:00 -0700
Subject: fix #3179: cut off radios and checkboxes

---
 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 da94fa1fa..7d967c6b3 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -173,8 +173,8 @@ input[type="hidden"] {
 // Indent the labels to position radios/checkboxes as hanging
 .radio,
 .checkbox {
+  min-height: 18px; // clear the floating input if there is no label text
   padding-left: 18px;
-  overflow: auto; // clear the floating input if there is no label text
 }
 .radio input[type="radio"],
 .checkbox input[type="checkbox"] {
-- 
cgit v1.2.3