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 /docs | |
| parent | 03a406d920c0255533aa0f5bb7c3fe4569b8f687 (diff) | |
| download | bootstrap-6881c193ca838844cacaf343d5918fb166bdd437.tar.xz bootstrap-6881c193ca838844cacaf343d5918fb166bdd437.zip | |
fixes #5039: properly set .row-fluid margins for .controls-row
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/css/bootstrap-responsive.css | 6 | ||||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 7 |
2 files changed, 12 insertions, 1 deletions
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 2d2d200c0..63ed85f76 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -215,6 +215,9 @@ .row-fluid [class*="span"]:first-child { margin-left: 0; } + .row-fluid .controls-row [class*="span"] + [class*="span"] { + margin-left: 2.564102564102564%; + } .row-fluid .span12 { width: 100%; *width: 99.94680851063829%; @@ -562,6 +565,9 @@ .row-fluid [class*="span"]:first-child { margin-left: 0; } + .row-fluid .controls-row [class*="span"] + [class*="span"] { + margin-left: 2.7624309392265194%; + } .row-fluid .span12 { width: 100%; *width: 99.94680851063829%; diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d6a249ee6..ce3e92584 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -355,6 +355,10 @@ a:hover { margin-left: 0; } +.row-fluid .controls-row [class*="span"] + [class*="span"] { + margin-left: 2.127659574468085%; +} + .row-fluid .span12 { width: 100%; *width: 99.94680851063829%; @@ -1302,7 +1306,8 @@ textarea.span1, clear: both; } -.controls-row [class*="span"] { +.controls-row [class*="span"], +.row-fluid .controls-row [class*="span"] { float: left; } |
