mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-24 11:52:51 +01:00
Code Issues Releases Wiki Activity

Merge pull request #1106 from olvlvl/2.0-wip

Browse Source 
2.0 wip
This commit is contained in:
Jacob Thornton 2012-01-22 19:48:53 -08:00
commit c424045c76
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/scaffolding.less
View File

@ -24,9 +24,9 @@ body {
// Fluid layouts (left aligned, with sidebar, min- & max-width content) // Fluid layouts (left aligned, with sidebar, min- & max-width content)
.fluid-container { .fluid-container {
position: relative; position: relative;
min-width: 940px; min-width: @siteWidth;
padding-left: 20px; padding-left: @gridGutterWidth;
padding-right: 20px; padding-right: @gridGutterWidth;
.clearfix(); .clearfix();
} }
@ -35,17 +35,17 @@ body {
width: @fluidSidebarWidth; width: @fluidSidebarWidth;
margin: 0 20px 18px; margin: 0 20px 18px;
} }
.sidebar-left { padding-left: @fluidSidebarWidth + 40; } .sidebar-left { padding-left: @fluidSidebarWidth + @gridGutterWidth * 2; }
.sidebar-right { padding-right: @fluidSidebarWidth + 40; } .sidebar-right { padding-right: @fluidSidebarWidth + @gridGutterWidth * 2; }
// Float the sidebars accordingly // Float the sidebars accordingly
.sidebar-left .fluid-sidebar { .sidebar-left .fluid-sidebar {
float: left; float: left;
margin-left: (@fluidSidebarWidth + 20) * -1; margin-left: (@fluidSidebarWidth + @gridGutterWidth) * -1;
} }
.sidebar-right .fluid-sidebar { .sidebar-right .fluid-sidebar {
float: right; float: right;
margin-right: (@fluidSidebarWidth + 20) * -1; margin-right: (@fluidSidebarWidth + @gridGutterWidth) * -1;
} }
// The main content area // The main content area