aboutsummaryrefslogtreecommitdiff
path: root/less/forms.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-09-17 16:09:36 -0700
committerMark Otto <[email protected]>2012-09-17 16:09:36 -0700
commit6881c193ca838844cacaf343d5918fb166bdd437 (patch)
tree7d8478357bade01855c8881113b38b58998c5ee1 /less/forms.less
parent03a406d920c0255533aa0f5bb7c3fe4569b8f687 (diff)
downloadbootstrap-6881c193ca838844cacaf343d5918fb166bdd437.tar.xz
bootstrap-6881c193ca838844cacaf343d5918fb166bdd437.zip
fixes #5039: properly set .row-fluid margins for .controls-row
Diffstat (limited to 'less/forms.less')
-rw-r--r--less/forms.less8
1 files changed, 6 insertions, 2 deletions
diff --git a/less/forms.less b/less/forms.less
index 7030ac3c1..d4e0f3487 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -304,8 +304,12 @@ textarea[class*="span"],
.controls-row {
.clearfix(); // Clear the float from controls
}
-.controls-row [class*="span"] {
- float: left; // Float to collapse white-space for proper grid alignment
+
+// Float to collapse white-space for proper grid alignment
+.controls-row [class*="span"],
+// Redeclare the fluid grid collapse since we undo the float for inputs
+.row-fluid .controls-row [class*="span"] {
+ float: left;
}