fix #2908: unfloat inputs using .span* in fluid row

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 75edca45a9a5de40bd76fa27bf618d161619de59..a6b39f69aa91b0ffa766adecdd43ee31cdd82cc2 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index e8547add77dd30237c91dbecacb373b47cb29a8a..c0b2325ba89dabf47e13a6a8aabbda4ad41a465a 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -804,7 +804,11 @@ select:focus {
 input[class*="span"],
 select[class*="span"],
 textarea[class*="span"],
-.uneditable-input[class*="span"] {
+.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"] {
   float: none;
   margin-left: 0;
 }

diff --git a/less/forms.less b/less/forms.less
index 1945bda609c2f58c1c1dfec376b9fda01b368c6f..240de5ed24b460a6ff697a9dbef0b173379c8632 100644 (file)
--- 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;
 }