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.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.css')
| -rw-r--r-- | bootstrap-1.2.0.css | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css index 708070985..7bd2e06a1 100644 --- a/bootstrap-1.2.0.css +++ b/bootstrap-1.2.0.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: Fri Sep 2 09:48:25 PDT 2011 + * Date: Fri Sep 2 09:52:17 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -404,11 +404,11 @@ body { .container-fluid:after { clear: both; } -.container-fluid .sidebar { +.container-fluid > .sidebar { float: left; width: 220px; } -.container-fluid .content { +.container-fluid > .content { min-width: 700px; max-width: 1180px; margin-left: 240px; |