diff options
| author | Jacob Thornton <[email protected]> | 2012-01-22 19:48:53 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-22 19:48:53 -0800 |
| commit | c424045c763440bf04cc7678c69d3f273d7e6e94 (patch) | |
| tree | fe927f96030bb2da965f854f95b662ba4f28f027 /lib | |
| parent | 87c676335c8b828ac00969f178498eea31f45809 (diff) | |
| parent | a583f055b382ae2f721e49dea61340257e1482d0 (diff) | |
| download | bootstrap-c424045c763440bf04cc7678c69d3f273d7e6e94.tar.xz bootstrap-c424045c763440bf04cc7678c69d3f273d7e6e94.zip | |
Merge pull request #1106 from olvlvl/2.0-wip
2.0 wip
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/scaffolding.less | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/scaffolding.less b/lib/scaffolding.less index a0d54a886..7ad8a7b16 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -24,9 +24,9 @@ body { // Fluid layouts (left aligned, with sidebar, min- & max-width content) .fluid-container { position: relative; - min-width: 940px; - padding-left: 20px; - padding-right: 20px; + min-width: @siteWidth; + padding-left: @gridGutterWidth; + padding-right: @gridGutterWidth; .clearfix(); } @@ -35,17 +35,17 @@ body { width: @fluidSidebarWidth; margin: 0 20px 18px; } -.sidebar-left { padding-left: @fluidSidebarWidth + 40; } -.sidebar-right { padding-right: @fluidSidebarWidth + 40; } +.sidebar-left { padding-left: @fluidSidebarWidth + @gridGutterWidth * 2; } +.sidebar-right { padding-right: @fluidSidebarWidth + @gridGutterWidth * 2; } // Float the sidebars accordingly .sidebar-left .fluid-sidebar { float: left; - margin-left: (@fluidSidebarWidth + 20) * -1; + margin-left: (@fluidSidebarWidth + @gridGutterWidth) * -1; } .sidebar-right .fluid-sidebar { float: right; - margin-right: (@fluidSidebarWidth + 20) * -1; + margin-right: (@fluidSidebarWidth + @gridGutterWidth) * -1; } // The main content area |