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.min.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.min.css')
| -rw-r--r-- | bootstrap.min.css | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/bootstrap.min.css b/bootstrap.min.css index fb036b6a0..9996dc318 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -25,11 +25,12 @@ body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size: .container:after{clear:both;} .fluid-container{position:relative;min-width:940px;padding-left:20px;padding-right:20px;zoom:1;}.fluid-container:before,.fluid-container:after{display:table;*display:inline;content:"";zoom:1;} .fluid-container:after{clear:both;} -.fluid-sidebar-left,.fluid-sidebar-right{width:220px;} -.fluid-sidebar-left{float:left;} -.fluid-sidebar-right{float:right;} -.fluid-content{margin-left:240px;} -.fluid-container.reverse .fluid-content{margin-left:0;margin-right:240px;} +.fluid-sidebar{width:220px;margin:0 20px 18px;} +.sidebar-left{padding-left:260px;} +.sidebar-right{padding-right:260px;} +.sidebar-left .fluid-sidebar{float:left;margin-left:-240px;} +.sidebar-right .fluid-sidebar{float:right;margin-right:-240px;} +.fluid-content{float:left;width:100%;} a{font-weight:inherit;line-height:inherit;color:#0088cc;text-decoration:none;}a:hover{color:#005580;text-decoration:underline;} .pull-right{float:right;} .pull-left{float:left;} |