rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

fixes #5039: properly set .row-fluid margins for .controls-row

Browse Source
This commit is contained in:
Mark Otto 2012-09-17 16:09:36 -07:00
parent 03a406d920
commit 6881c193ca
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/assets/css/bootstrap-responsive.css vendored
View File

@ -215,6 +215,9 @@
.row-fluid [class*="span"]:first-child { .row-fluid [class*="span"]:first-child {
margin-left: 0; margin-left: 0;
} }
.row-fluid .controls-row [class*="span"] + [class*="span"] {
margin-left: 2.564102564102564%;
}
.row-fluid .span12 { .row-fluid .span12 {
width: 100%; width: 100%;
*width: 99.94680851063829%; *width: 99.94680851063829%;
@ -562,6 +565,9 @@
.row-fluid [class*="span"]:first-child { .row-fluid [class*="span"]:first-child {
margin-left: 0; margin-left: 0;
} }
.row-fluid .controls-row [class*="span"] + [class*="span"] {
margin-left: 2.7624309392265194%;
}
.row-fluid .span12 { .row-fluid .span12 {
width: 100%; width: 100%;
*width: 99.94680851063829%; *width: 99.94680851063829%;

7
docs/assets/css/bootstrap.css vendored
View File

@ -355,6 +355,10 @@ a:hover {
margin-left: 0; margin-left: 0;
} }
.row-fluid .controls-row [class*="span"] + [class*="span"] {
margin-left: 2.127659574468085%;
}
.row-fluid .span12 { .row-fluid .span12 {
width: 100%; width: 100%;
*width: 99.94680851063829%; *width: 99.94680851063829%;
@ -1302,7 +1306,8 @@ textarea.span1,
clear: both; clear: both;
} }
.controls-row [class*="span"] { .controls-row [class*="span"],
.row-fluid .controls-row [class*="span"] {
float: left; float: left;
} }

8
less/forms.less
View File

@ -304,8 +304,12 @@ textarea[class*="span"],
.controls-row { .controls-row {
.clearfix(); // Clear the float from controls .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;
} }

5
less/mixins.less
View File

@ -642,6 +642,11 @@
margin-left: 0; 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 // generate .spanX and .offsetX
.spanX (@gridColumns); .spanX (@gridColumns);
.offsetX (@gridColumns); .offsetX (@gridColumns);