aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-04-02 22:49:19 -0700
committerMark Otto <[email protected]>2012-04-02 22:49:19 -0700
commit2ea437f353a636a277320513db04ced4fc0f7da2 (patch)
tree25837549eb3cffc9f49e76063f481a13619f9da1
parent4462f24753463dda66a8301ff10b8e7c0abc5ac8 (diff)
downloadbootstrap-2ea437f353a636a277320513db04ced4fc0f7da2.tar.xz
bootstrap-2ea437f353a636a277320513db04ced4fc0f7da2.zip
fix #2908: unfloat inputs using .span* in fluid row
-rw-r--r--docs/assets/bootstrap.zipbin56990 -> 57025 bytes
-rw-r--r--docs/assets/css/bootstrap.css6
-rw-r--r--less/forms.less7
3 files changed, 11 insertions, 2 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 75edca45a..a6b39f69a 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index e8547add7..c0b2325ba 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 1945bda60..240de5ed2 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;
}