diff options
| author | Mark Otto <[email protected]> | 2011-09-02 09:52:33 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-09-02 09:52:33 -0700 |
| commit | a4dc2c8955e0db79cc800f38d949db0ba0e7ba9a (patch) | |
| tree | 33a90b5f6992d54aa9245a9624966753d896b5b0 /bootstrap-1.2.0.min.css | |
| parent | b18633ee144789cf1c64b23040239223c5a2a1d4 (diff) | |
| parent | f29c8abcbbebefa1bb27324cdfb1c22a63e1519e (diff) | |
| download | bootstrap-a4dc2c8955e0db79cc800f38d949db0ba0e7ba9a.tar.xz bootstrap-a4dc2c8955e0db79cc800f38d949db0ba0e7ba9a.zip | |
merge in master after merging a pull request, add comment
Diffstat (limited to 'bootstrap-1.2.0.min.css')
| -rw-r--r-- | bootstrap-1.2.0.min.css | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bootstrap-1.2.0.min.css b/bootstrap-1.2.0.min.css index ada6fc04d..7769c7a8c 100644 --- a/bootstrap-1.2.0.min.css +++ b/bootstrap-1.2.0.min.css @@ -68,8 +68,8 @@ body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size: .container{width:940px;margin:0 auto;} .container-fluid{padding:0 20px;zoom:1;margin-bottom:18px;}.container-fluid:before,.container-fluid:after{display:table;content:"";} .container-fluid:after{clear:both;} -.container-fluid .sidebar{float:left;width:220px;} -.container-fluid .content{min-width:700px;max-width:1180px;margin-left:240px;} +.container-fluid>.sidebar{float:left;width:220px;} +.container-fluid>.content{min-width:700px;max-width:1180px;margin-left:240px;} a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#0050a3;text-decoration:underline;} p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;} h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;} |