From eb3a4b8f759299e4157bd32deb6016587f48acb4 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 4 Jun 2012 08:33:42 -0700
Subject: fix placeholder for FF by attaching input and textarea when we call
 the mixin

---
 less/forms.less | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 1163fe914..56f215d6c 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -343,7 +343,10 @@ select:focus:required:invalid {
 }
 
 // Placeholder text gets special styles; can't be bundled together though for some reason
-.placeholder();
+input,
+textarea {
+  .placeholder();
+}
 
 
 
-- 
cgit v1.2.3


From 5563b8448eb4472743605cb006473387ebf1529a Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 4 Jun 2012 08:45:51 -0700
Subject: fix #3693: rounded corners on search form

---
 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 56f215d6c..10c586ee0 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -468,7 +468,7 @@ textarea {
 // SEARCH FORM
 // -----------
 
-.search-query {
+input.search-query {
   padding-right: 14px;
   padding-right: 4px \9;
   padding-left: 14px;
-- 
cgit v1.2.3


From eef87c96afb281e343b9ad6345220b41457a85d7 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 4 Jun 2012 20:27:42 -0700
Subject: #3684: reset width to auto for input type='image'

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

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 10c586ee0..633ad4551 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -139,7 +139,8 @@ input[type="checkbox"] {
   cursor: pointer;
 }
 
-// Reset width of input buttons, radios, checkboxes
+// Reset width of input images, buttons, radios, checkboxes
+input[type="image"],
 input[type="submit"],
 input[type="reset"],
 input[type="button"],
-- 
cgit v1.2.3


From b1cb5565039f492766fdfd727f776f3e9dfa7e45 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Thu, 14 Jun 2012 11:56:46 -0700
Subject: improve inline-block of append/prepend inputs with font-size: 0;

---
 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 633ad4551..9f5e721bb 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -380,12 +380,14 @@ textarea {
 .input-prepend,
 .input-append {
   margin-bottom: 5px;
+  font-size: 0;
   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;
+    font-size: @baseFontSize;
     vertical-align: middle;
     .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
     // Make input on top when focused so blue border and shadow always show
@@ -402,6 +404,7 @@ textarea {
     height: @baseLineHeight;
     min-width: 16px;
     padding: 4px 5px;
+    font-size: @baseFontSize;
     font-weight: normal;
     line-height: @baseLineHeight;
     text-align: center;
-- 
cgit v1.2.3


From d14f06fc4ed3f4753de9ae5ef247c48629714935 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Tue, 19 Jun 2012 13:25:35 -0700
Subject: round select list corners

---
 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 9f5e721bb..4f9d9f3e1 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -85,6 +85,7 @@ input[type="color"],
   font-size: @baseFontSize;
   line-height: @baseLineHeight;
   color: @gray;
+  .border-radius(@inputBorderRadius);
 }
 
 // Reset appearance properties for textual inputs and textarea
@@ -116,7 +117,6 @@ input[type="color"],
 .uneditable-input {
   background-color: @inputBackground;
   border: 1px solid @inputBorder;
-  .border-radius(@inputBorderRadius);
   .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
   @transition: border linear .2s, box-shadow linear .2s;
   .transition(@transition);
-- 
cgit v1.2.3


From d65e815a48fd869bcdc4e4112cf675a1f987fc49 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 25 Jun 2012 16:47:29 -0700
Subject: use @textColor to change help-block/help-inline font color

---
 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 4f9d9f3e1..911af1a25 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -356,7 +356,7 @@ textarea {
 
 .help-block,
 .help-inline {
-  color: @gray; // lighten the text some for contrast
+  color: lighten(@textColor, 15%); // lighten the text some for contrast
 }
 
 .help-block {
-- 
cgit v1.2.3


From cd2d82150cc27c1f81d2394a22efbf2dbec0e7be Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Thu, 28 Jun 2012 21:46:45 -0700
Subject: standardize top level file comments

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

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 911af1a25..f97d6aeef 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -1,6 +1,6 @@
-// Forms.less
-// Base styles for various input types, form layouts, and states
-// -------------------------------------------------------------
+//
+// Forms
+// --------------------------------------------------
 
 
 // GENERAL STYLES
-- 
cgit v1.2.3


From dc6eaafb00426315a3720324d7fc3a4a33a04ddf Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Fri, 6 Jul 2012 10:59:46 -0700
Subject: vertically align inline form content

---
 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 f97d6aeef..1b57b66be 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -502,6 +502,7 @@ input.search-query {
     display: inline-block;
     .ie7-inline-block();
     margin-bottom: 0;
+    vertical-align: middle;
   }
   // Re-hide hidden elements due to specifity
   .hide {
-- 
cgit v1.2.3


From e2b777d9a3ea12ec10f6046975ec0f43c6636601 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sat, 7 Jul 2012 12:34:47 -0700
Subject: docs pre font-size and nowrap on 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 1b57b66be..b53159a1e 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -381,6 +381,7 @@ textarea {
 .input-append {
   margin-bottom: 5px;
   font-size: 0;
+  white-space: nowrap; // Prevent span and input from separating
   input,
   select,
   .uneditable-input {
-- 
cgit v1.2.3


From 3f2f96b0d71e64bd53d5175d0876f25f23a7835b Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sat, 7 Jul 2012 12:52:05 -0700
Subject: reoder forms a bit

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

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index b53159a1e..a30cc3fcf 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -149,12 +149,6 @@ input[type="checkbox"] {
   width: auto; // Override of generic input selector
 }
 
-// Make uneditable textareas behave like a textarea
-.uneditable-textarea {
-  width: auto;
-  height: auto;
-}
-
 // Set the height of select and file controls to match text inputs
 select,
 input[type="file"] {
@@ -184,6 +178,41 @@ input[type="checkbox"]:focus {
 }
 
 
+// Uneditable inputs
+// -------------------------
+
+// Make uneditable inputs look inactive
+.uneditable-input,
+.uneditable-textarea {
+  color: @grayLight;
+  background-color: darken(@inputBackground, 1%);
+  border-color: @inputBorder;
+  .box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
+  cursor: not-allowed;
+}
+
+// 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;
+}
+
+// Make uneditable textareas behave like a textarea
+.uneditable-textarea {
+  width: auto;
+  height: auto;
+}
+
+
+// Placeholder
+// -------------------------
+
+// Placeholder text gets special styles; can't be bundled together though for some reason
+input,
+textarea {
+  .placeholder();
+}
+
 
 // CHECKBOXES & RADIOS
 // -------------------
@@ -333,22 +362,6 @@ select:focus:required:invalid {
   .clearfix(); // Adding clearfix to allow for .pull-right button containers
 }
 
-// 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));
-}
-
-// Placeholder text gets special styles; can't be bundled together though for some reason
-input,
-textarea {
-  .placeholder();
-}
-
 
 
 // HELP TEXT
@@ -382,6 +395,7 @@ textarea {
   margin-bottom: 5px;
   font-size: 0;
   white-space: nowrap; // Prevent span and input from separating
+
   input,
   select,
   .uneditable-input {
@@ -396,9 +410,6 @@ textarea {
       z-index: 2;
     }
   }
-  .uneditable-input {
-    border-left-color: #ccc;
-  }
   .add-on {
     display: inline-block;
     width: auto;
@@ -440,10 +451,6 @@ textarea {
   .uneditable-input {
     .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
   }
-  .uneditable-input {
-    border-right-color: #ccc;
-    border-left-color: #eee;
-  }
   .add-on:last-child,
   .btn:last-child {
     .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
-- 
cgit v1.2.3


From 7800fee7e0874446bbbcd6148206800cdebe2fe9 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 9 Jul 2012 00:51:38 -0700
Subject: fixes #3973: same border on disabled inputs as default inputs:

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

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index a30cc3fcf..63ee05751 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -306,7 +306,6 @@ select[readonly],
 textarea[readonly] {
   cursor: not-allowed;
   background-color: @inputDisabledBackground;
-  border-color: #ddd;
 }
 // Explicitly reset the colors here
 input[type="radio"][disabled],
-- 
cgit v1.2.3


From 93be608bf0a4b85ec3331ebcc14e40f99a1974f2 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 9 Jul 2012 20:49:17 -0700
Subject: fixes #3384: add support for multiple inputs per line when using grid
 sizing

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

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 63ee05751..078b36704 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -290,8 +290,18 @@ textarea[class*="span"],
 // GRID SIZING FOR INPUTS
 // ----------------------
 
+// Grid sizes
 #grid > .input(@gridColumnWidth, @gridGutterWidth);
 
+// Control row for multiple inputs per line
+.controls-row {
+  .clearfix(); // Clear the float from controls
+}
+.controls-row [class*="span"] {
+  float: left; // Float to collapse white-space for proper grid alignment
+}
+
+
 
 
 // DISABLED STATE
-- 
cgit v1.2.3


From 5d8e78e0faedb4365216f1ebbc5d70dc560f3f6e Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Tue, 10 Jul 2012 00:32:04 -0700
Subject: fixes #3605: add support for input-prepend/-append to .form-search

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

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 078b36704..ddadab8ca 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -22,7 +22,7 @@ legend {
   display: block;
   width: 100%;
   padding: 0;
-  margin-bottom: @baseLineHeight * 1.5;
+  margin-bottom: @baseLineHeight;
   font-size: @baseFontSize * 1.5;
   line-height: @baseLineHeight * 2;
   color: @grayDark;
@@ -399,8 +399,8 @@ select:focus:required:invalid {
 // ------------
 
 // Allow us to put symbols and text within the input field for a cleaner look
-.input-prepend,
-.input-append {
+.input-append,
+.input-prepend {
   margin-bottom: 5px;
   font-size: 0;
   white-space: nowrap; // Prevent span and input from separating
@@ -489,15 +489,34 @@ select:focus:required:invalid {
 // SEARCH FORM
 // -----------
 
-input.search-query {
+.search-query {
   padding-right: 14px;
   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
+  margin-bottom: 0; // Remove the default margin on all inputs
   .border-radius(14px);
 }
 
+/* Allow for input prepend/append in search forms */
+.form-search .input-append .search-query,
+.form-search .input-prepend .search-query {
+  .border-radius(0); // Override due to specificity
+}
+.form-search .input-append .search-query {
+  .border-radius(14px 0 0 14px)
+}
+.form-search .input-append .btn {
+  .border-radius(0 14px 14px 0)
+}
+.form-search .input-prepend .search-query {
+  .border-radius(0 14px 14px 0)
+}
+.form-search .input-prepend .btn {
+  .border-radius(14px 0 0 14px)
+}
+
+
 
 
 // HORIZONTAL & VERTICAL FORMS
-- 
cgit v1.2.3


From 7590e65f6f4641d946d0bfec2f4a84bbd3f561cd Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Tue, 24 Jul 2012 01:44:12 -0700
Subject: fix search form, mostly in navbar

---
 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 ddadab8ca..1a469072c 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -495,7 +495,7 @@ select:focus:required:invalid {
   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);
+  .border-radius(15px);
 }
 
 /* Allow for input prepend/append in search forms */
-- 
cgit v1.2.3


From 134d11b5283de087a6f069e59fbceed3de52092e Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sun, 29 Jul 2012 12:10:29 -0700
Subject: use shorthand on form field transitions for box-shadow mixin

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

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 1a469072c..0c913b952 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -118,8 +118,7 @@ input[type="color"],
   background-color: @inputBackground;
   border: 1px solid @inputBorder;
   .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
-  @transition: border linear .2s, box-shadow linear .2s;
-  .transition(@transition);
+  .transition(~"border linear .2s, box-shadow linear .2s");
 
   // Focus state
   &:focus {
-- 
cgit v1.2.3


From 364dbb7931393cb8fa796d75ec1f32a757d335e1 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 30 Jul 2012 15:38:36 -0700
Subject: fixes #3665: ensure inputs in a fluid row maintain grid sizing

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

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 0c913b952..d127a5e9a 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -279,6 +279,10 @@ textarea[class*="span"],
 .input-append .uneditable-input[class*="span"],
 .input-prepend input[class*="span"],
 .input-prepend .uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"],
 .row-fluid .input-prepend [class*="span"],
 .row-fluid .input-append [class*="span"] {
   display: inline-block;
-- 
cgit v1.2.3


From fab1a80dcb944f32fd9655d6bde3511d5df52aa2 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Wed, 1 Aug 2012 11:35:31 -0700
Subject: increase margin on checkboxes and radios to center properly

---
 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 d127a5e9a..b2095e6f4 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -132,7 +132,7 @@ input[type="color"],
 // Position radios and checkboxes better
 input[type="radio"],
 input[type="checkbox"] {
-  margin: 3px 0;
+  margin: 4px 0;
   *margin-top: 0; /* IE7 */
   line-height: normal;
   cursor: pointer;
-- 
cgit v1.2.3


From 735001cb266def8185367ae9d48207e46f6e023f Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Wed, 1 Aug 2012 11:53:00 -0700
Subject: increase horizontal padding on inputs given new font-size

---
 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 b2095e6f4..8dfef255a 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -80,7 +80,7 @@ input[type="color"],
 .uneditable-input {
   display: inline-block;
   height: @baseLineHeight;
-  padding: 4px;
+  padding: 4px 6px;
   margin-bottom: 9px;
   font-size: @baseFontSize;
   line-height: @baseLineHeight;
-- 
cgit v1.2.3


From 4bf93a2d76ddec19e22be771ef1832ef563c91a5 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 13 Aug 2012 23:03:35 -0700
Subject: fixes #4265: restore chromium select fix

---
 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 8dfef255a..0b3f10cb0 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -160,6 +160,7 @@ input[type="file"] {
 select {
   width: 220px; // default input width + 10px of padding that doesn't get applied
   border: 1px solid #bbb;
+  background-color: @inputBackground; // Chrome on Linux and Mobile Safari need background-color
 }
 
 // Make multiple select elements height not fixed
-- 
cgit v1.2.3


From 5144c77b272e12a48913faa0b7d1e54eccd2e638 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Tue, 14 Aug 2012 14:57:49 -0700
Subject: fixes #4358: make select elements 30px tall to match inputs

---
 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 0b3f10cb0..852f0bb6b 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -151,9 +151,9 @@ input[type="checkbox"] {
 // Set the height of select and file controls to match text inputs
 select,
 input[type="file"] {
-  height: 28px; /* In IE7, the height of the select element cannot be changed by height, only font-size */
+  height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */
   *margin-top: 4px; /* For IE7, add top margin to align select with labels */
-  line-height: 28px;
+  line-height: 30px;
 }
 
 // Make select elements obey height by applying a border
-- 
cgit v1.2.3


From 780636d955d5c121133de526ba72c1874f7c0337 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Tue, 14 Aug 2012 15:29:47 -0700
Subject: fixes #3674: checkbox vertical alignment in IE9

---
 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 852f0bb6b..490b6bb91 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -134,6 +134,7 @@ input[type="radio"],
 input[type="checkbox"] {
   margin: 4px 0;
   *margin-top: 0; /* IE7 */
+  margin-top: 1px \9; /* IE8-9 */
   line-height: normal;
   cursor: pointer;
 }
-- 
cgit v1.2.3


From f933a41c7bb71e58a4c151389748b92c8a204a27 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Tue, 14 Aug 2012 15:34:10 -0700
Subject: remove bottom margin on 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 490b6bb91..02ea7a518 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -132,7 +132,7 @@ input[type="color"],
 // Position radios and checkboxes better
 input[type="radio"],
 input[type="checkbox"] {
-  margin: 4px 0;
+  margin: 4px 0 0;
   *margin-top: 0; /* IE7 */
   margin-top: 1px \9; /* IE8-9 */
   line-height: normal;
-- 
cgit v1.2.3


From 9e6322dbab50d416246317d0e0e1b02477845bb4 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Fri, 17 Aug 2012 12:59:32 -0700
Subject: fixes #4428: specifity on .search-query increased

---
 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 02ea7a518..2dc814e2e 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -494,7 +494,7 @@ select:focus:required:invalid {
 // SEARCH FORM
 // -----------
 
-.search-query {
+input.search-query {
   padding-right: 14px;
   padding-right: 4px \9;
   padding-left: 14px;
-- 
cgit v1.2.3


From 2b22c0c56efb86c213884897f14383f45e1414b3 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Fri, 17 Aug 2012 16:00:36 -0700
Subject: fixes #4438: button groups in inline forms now render inline

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

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 2dc814e2e..03bec5d35 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -551,7 +551,9 @@ input.search-query {
   }
 }
 .form-search label,
-.form-inline label {
+.form-inline label,
+.form-search .btn-group,
+.form-inline .btn-group {
   display: inline-block;
 }
 // Remove margin for input-prepend/-append
-- 
cgit v1.2.3


From 256a25f25c8adc266f9af3099b5143cb49097443 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Fri, 17 Aug 2012 16:28:45 -0700
Subject: fixes #4260 and #4322: set vertical-align to top on input-prepend
 components to solve modal rounding issues

---
 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 03bec5d35..c77339e41 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -417,7 +417,7 @@ select:focus:required:invalid {
     margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
     *margin-left: 0;
     font-size: @baseFontSize;
-    vertical-align: middle;
+    vertical-align: top;
     .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
     // Make input on top when focused so blue border and shadow always show
     &:focus {
@@ -435,13 +435,13 @@ select:focus:required:invalid {
     line-height: @baseLineHeight;
     text-align: center;
     text-shadow: 0 1px 0 @white;
-    vertical-align: middle;
     background-color: @grayLighter;
     border: 1px solid #ccc;
   }
   .add-on,
   .btn {
     margin-left: -1px;
+    vertical-align: top;
     .border-radius(0);
   }
   .active {
-- 
cgit v1.2.3


From 73cf9c4db8423f6987ff0eb828db32eaed21c975 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 20 Aug 2012 10:28:41 -0700
Subject: fixes #4469 manually: reset width on file 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 c77339e41..77b5135a4 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -140,6 +140,7 @@ input[type="checkbox"] {
 }
 
 // Reset width of input images, buttons, radios, checkboxes
+input[type="file"],
 input[type="image"],
 input[type="submit"],
 input[type="reset"],
-- 
cgit v1.2.3