diff options
| author | Mark Otto <[email protected]> | 2012-01-07 01:59:53 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-07 01:59:53 -0800 |
| commit | 5fb2c666acfd5e7d2f134d2cb5b65b828102c5a9 (patch) | |
| tree | 2624482cc8403f0aab60ac4dbde70db18bf1f780 /bootstrap.css | |
| parent | 45d671d97f4d448780729bbb6357e9ec776f980c (diff) | |
| download | bootstrap-5fb2c666acfd5e7d2f134d2cb5b65b828102c5a9.tar.xz bootstrap-5fb2c666acfd5e7d2f134d2cb5b65b828102c5a9.zip | |
update the fluid examples to use new classes and clear the floats properly from sidebar
Diffstat (limited to 'bootstrap.css')
| -rw-r--r-- | bootstrap.css | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/bootstrap.css b/bootstrap.css index 411bc9c43..2f57e5f95 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sat Jan 7 01:22:18 PST 2012 + * Date: Sat Jan 7 01:58:07 PST 2012 */ html, body { margin: 0; @@ -209,21 +209,27 @@ body { .fluid-container:after { clear: both; } -.fluid-sidebar-left, .fluid-sidebar-right { +.fluid-sidebar { width: 220px; + margin: 0 20px 18px; } -.fluid-sidebar-left { +.sidebar-left { + padding-left: 260px; +} +.sidebar-right { + padding-right: 260px; +} +.sidebar-left .fluid-sidebar { float: left; + margin-left: -240px; } -.fluid-sidebar-right { +.sidebar-right .fluid-sidebar { float: right; + margin-right: -240px; } .fluid-content { - margin-left: 240px; -} -.fluid-container.reverse .fluid-content { - margin-left: 0; - margin-right: 240px; + float: left; + width: 100%; } a { font-weight: inherit; |
