diff options
| author | Mark Otto <[email protected]> | 2012-09-17 16:09:36 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-09-17 16:09:36 -0700 |
| commit | 6881c193ca838844cacaf343d5918fb166bdd437 (patch) | |
| tree | 7d8478357bade01855c8881113b38b58998c5ee1 /less | |
| parent | 03a406d920c0255533aa0f5bb7c3fe4569b8f687 (diff) | |
| download | bootstrap-6881c193ca838844cacaf343d5918fb166bdd437.tar.xz bootstrap-6881c193ca838844cacaf343d5918fb166bdd437.zip | |
fixes #5039: properly set .row-fluid margins for .controls-row
Diffstat (limited to 'less')
| -rw-r--r-- | less/forms.less | 8 | ||||
| -rw-r--r-- | less/mixins.less | 5 |
2 files changed, 11 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; } diff --git a/less/mixins.less b/less/mixins.less index c146e4005..4650d4790 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -642,6 +642,11 @@ margin-left: 0; } + // Space grid-sized controls properly if multiple per line + .controls-row [class*="span"] + [class*="span"] { + margin-left: @fluidGridGutterWidth; + } + // generate .spanX and .offsetX .spanX (@gridColumns); .offsetX (@gridColumns); |