fixes #3665: ensure inputs in a fluid row maintain grid sizing

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index dd9b96bc16681d9af8a9295e1b026c9f8062c24f..59cf075796d078f61bf07db55a3278a339dd67ad 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1165,6 +1165,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;

diff --git a/less/forms.less b/less/forms.less
index 0c913b952b945d6c130ef14c13c4ad315e8c7403..d127a5e9a2be381c051023c2759c4f9eac65f96e 100644 (file)
--- 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;

diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html
index 3ded955bf6bc63e08f36a76d54581c43c736a59b..71de6cce7415ecae3f289f26787ae1672ff0fdfe 100644 (file)
--- a/less/tests/css-tests.html
+++ b/less/tests/css-tests.html
@@ -796,6 +796,25 @@
     </div><!--/span-->
   </div><!--/row-->
 </div>
+
+<br>
+
+<h4>Inline form in fluid row</h4>
+
+<div class="row-fluid">
+  <div class="span12">
+    <form class="form-inline">
+      <input type="text" class="span3" placeholder="Email">
+      <input type="password" class="span3" placeholder="Password">
+      <label class="checkbox">
+        <input type="checkbox"> Remember me
+      </label>
+      <button type="submit" class="btn">Sign in</button>
+    </form>
+  </div>
+</div>
+
+
 <br>