From: Mark Otto <markotto@twitter.com>
Date: Tue, 3 Apr 2012 05:49:19 +0000 (-0700)
Subject: fix #2908: unfloat inputs using .span* in fluid row
X-Git-Tag: v2.0.3~5^2~56^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ea437f353a636a277320513db04ced4fc0f7da2;p=thirdparty%2Fbootstrap.git

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

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 75edca45a9..a6b39f69aa 100644
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 e8547add77..c0b2325ba8 100644
--- 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 1945bda609..240de5ed24 100644
--- 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;
 }