diff options
| author | Mark Otto <[email protected]> | 2012-01-07 03:53:20 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-07 03:53:20 -0800 |
| commit | 33dad13014ae2272d3fcf799f114bfcf8256d968 (patch) | |
| tree | 15a69e5b256bf0b9de12e3fc44c57148ebbc5d11 | |
| parent | 8ccc3bcf03fedbe8c3a19a96c08a5cad6ae456e8 (diff) | |
| download | bootstrap-33dad13014ae2272d3fcf799f114bfcf8256d968.tar.xz bootstrap-33dad13014ae2272d3fcf799f114bfcf8256d968.zip | |
update fluid layout to use variable for sidebar width
| -rw-r--r-- | bootstrap.css | 2 | ||||
| -rw-r--r-- | lib/scaffolding.less | 10 | ||||
| -rw-r--r-- | lib/variables.less | 3 |
3 files changed, 9 insertions, 6 deletions
diff --git a/bootstrap.css b/bootstrap.css index 98aec3f27..8d80b4adf 100644 --- a/bootstrap.css +++ b/bootstrap.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: Sat Jan 7 03:37:53 PST 2012 + * Date: Sat Jan 7 03:52:42 PST 2012 */ html, body { margin: 0; diff --git a/lib/scaffolding.less b/lib/scaffolding.less index f454b2e91..7432e849b 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -32,15 +32,15 @@ body { // Sidebars (left and right options) .fluid-sidebar { - width: 220px; + width: @fluidSidebarWidth; margin: 0 20px 18px; } -.sidebar-left { padding-left: 260px; } -.sidebar-right { padding-right: 260px; } +.sidebar-left { padding-left: @fluidSidebarWidth + 40; } +.sidebar-right { padding-right: @fluidSidebarWidth + 40; } // Float the sidebars accordingly -.sidebar-left .fluid-sidebar { float: left; margin-left: -240px; } -.sidebar-right .fluid-sidebar { float: right; margin-right: -240px; } +.sidebar-left .fluid-sidebar { float: left; margin-left: (@fluidSidebarWidth + 20) * -1; } +.sidebar-right .fluid-sidebar { float: right; margin-right: (@fluidSidebarWidth + 20) * -1; } // The main content area .fluid-content { diff --git a/lib/variables.less b/lib/variables.less index 03f1028f8..dfd773304 100644 --- a/lib/variables.less +++ b/lib/variables.less @@ -43,6 +43,9 @@ @gridGutterWidth: 20px; @siteWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)); +// Fluid width sidebar +@fluidSidebarWidth: 220px; + // THEME VARIABLES // --------------- |