diff options
| author | Mark Otto <[email protected]> | 2011-09-02 09:51:32 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-09-02 09:51:32 -0700 |
| commit | f29c8abcbbebefa1bb27324cdfb1c22a63e1519e (patch) | |
| tree | afcadc90ef64607de0ddf9f8641991d518abb9c3 /bootstrap-1.1.1.css | |
| parent | 44b18f4911e125cc07a6d56292983b0cbfa3ae19 (diff) | |
| parent | 55698b303d58c08636637bf4147b22c521beb8b8 (diff) | |
| download | bootstrap-f29c8abcbbebefa1bb27324cdfb1c22a63e1519e.tar.xz bootstrap-f29c8abcbbebefa1bb27324cdfb1c22a63e1519e.zip | |
Merge pull request #138 from pthrasher/master
Fix for popover issue from #136
Diffstat (limited to 'bootstrap-1.1.1.css')
| -rw-r--r-- | bootstrap-1.1.1.css | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bootstrap-1.1.1.css b/bootstrap-1.1.1.css index 9f422a243..2fd6680fd 100644 --- a/bootstrap-1.1.1.css +++ b/bootstrap-1.1.1.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 Aug 26 19:31:44 PDT 2011 + * Date: Fri Sep 2 12:48:19 EDT 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). @@ -412,11 +412,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; |