From b8511568637dfa4decb3f0475436a3dfa637a57d Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Wed, 25 Jan 2012 11:26:45 -0800
Subject: [PATCH] change form fields back to inline-block to allow for
 inline-help text in default form markup

---
 bootstrap.css                          | 4 ++--
 bootstrap.min.css                      | 2 +-
 docs/base-css.html                     | 2 +-
 docs/templates/pages/base-css.mustache | 2 +-
 lib/forms.less                         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 0166a32015..39add86960 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Wed Jan 25 11:21:22 PST 2012
+ * Date: Wed Jan 25 11:24:56 PST 2012
  */
 article,
 aside,
@@ -497,7 +497,7 @@ input,
 textarea,
 select,
 .uneditable-input {
-  display: block;
+  display: inline-block;
   width: 210px;
   height: 18px;
   padding: 4px;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 438305f715..20614ea732 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -94,7 +94,7 @@ fieldset{padding:0;margin:0;border:0;}
 legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #eee;-webkit-margin-collapse:separate;}
 label,input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;}
 label{display:block;margin-bottom:5px;color:#333333;}
-input,textarea,select,.uneditable-input{display:block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
 .uneditable-textarea{width:auto;height:auto;}
 input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;cursor:pointer;}
 input[type=file]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
diff --git a/docs/base-css.html b/docs/base-css.html
index 1a9c4e15ab..057c98b859 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -899,7 +899,7 @@
     <div class="span9">
       <form class="well">
         <label>Label name</label>
-        <input type="text" class="span3" placeholder="Type something…">
+        <input type="text" class="span3" placeholder="Type something…"> <span class="help-inline">Associated help text!</span>
         <label class="checkbox">
           <input type="checkbox"> Check me out
         </label>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 4263bead3b..4daa98309d 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -835,7 +835,7 @@
     <div class="span9">
       <form class="well">
         <label>{{_i}}Label name{{/i}}</label>
-        <input type="text" class="span3" placeholder="{{_i}}Type something…{{/i}}">
+        <input type="text" class="span3" placeholder="{{_i}}Type something…{{/i}}"> <span class="help-inline">Associated help text!</span>
         <label class="checkbox">
           <input type="checkbox"> {{_i}}Check me out{{/i}}
         </label>
diff --git a/lib/forms.less b/lib/forms.less
index 178c210181..70a065bdb6 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -52,7 +52,7 @@ input,
 textarea,
 select,
 .uneditable-input {
-  display: block;
+  display: inline-block;
   width: 210px;
   height: @baseLineHeight;
   padding: 4px;