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 /lib | |
| 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 'lib')
| -rw-r--r-- | lib/scaffolding.less | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/scaffolding.less b/lib/scaffolding.less index b84b43721..615e6be78 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -81,11 +81,12 @@ body { .container-fluid { padding: 0 20px; .clearfix(); - .sidebar { + > .sidebar { float: left; width: 220px; } - .content { + // TODO in v2: rename this and .popover .content to be more specific + > .content { min-width: 700px; max-width: 1180px; margin-left: 240px; @@ -106,4 +107,4 @@ a { color: @linkColorHover; text-decoration: underline; } -}
\ No newline at end of file +} |