make inline and search form labels inline-block

diff --git a/bootstrap.css b/bootstrap.css
index c5d011b7e86c0489004e77d661866b1dc08dc3d0..8d7b08a35d8900f7a3e6ccdf36a040fdfa379ee3 100644 (file)
--- 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: Sat Jan 14 16:23:58 PST 2012
+ * Date: Sat Jan 14 16:38:32 PST 2012
  */
 html, body {
   margin: 0;
@@ -957,6 +957,9 @@ input::-webkit-input-placeholder {
   display: inline-block;
   margin-bottom: 0;
 }
+.search-form label, .inline-form label {
+  display: inline-block;
+}
 .control-group {
   margin-bottom: 18px;
 }

diff --git a/bootstrap.min.css b/bootstrap.min.css
index 637c31ad89e0b8655011bed2d8faf853cb9efcc4..5341d3595000d9ac3b84eb032f3ab3e91459e4e5 100644 (file)
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -170,6 +170,7 @@ input::-webkit-input-placeholder{color:#999999;}
 .input-append .add-on{margin-right:0;margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
 .search-query{padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;}
 .search-form input,.inline-form input,.horizontal-form input,.search-form textarea,.inline-form textarea,.horizontal-form textarea,.search-form select,.inline-form select,.horizontal-form select,.search-form .uneditable-input,.inline-form .uneditable-input,.horizontal-form .uneditable-input{display:inline-block;margin-bottom:0;}
+.search-form label,.inline-form label{display:inline-block;}
 .control-group{margin-bottom:18px;}
 .control-group>label{font-weight:bold;}
 .horizontal-form .control-group>label{float:left;width:130px;padding-top:5px;text-align:right;}

diff --git a/lib/forms.less b/lib/forms.less
index 50533104485a3ba3f2ef3718d2f14caa2e270769..ed97d8dd09ee943040c9a71a2c62388d81d67291 100644 (file)
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -452,6 +452,10 @@ input::-webkit-input-placeholder {
     margin-bottom: 0;
   }
 }
+.search-form label,
+.inline-form label {
+  display: inline-block;
+}
 
 // Margin to space out fieldsets
 .control-group {