0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-06 04:08:22 +01:00

update fluid layout to use variable for sidebar width

This commit is contained in:
Mark Otto 2012-01-07 03:53:20 -08:00
parent 8ccc3bcf03
commit 33dad13014
3 changed files with 9 additions and 6 deletions

2
bootstrap.css vendored
View File

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * 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 { html, body {
margin: 0; margin: 0;

View File

@ -32,15 +32,15 @@ body {
// Sidebars (left and right options) // Sidebars (left and right options)
.fluid-sidebar { .fluid-sidebar {
width: 220px; width: @fluidSidebarWidth;
margin: 0 20px 18px; margin: 0 20px 18px;
} }
.sidebar-left { padding-left: 260px; } .sidebar-left { padding-left: @fluidSidebarWidth + 40; }
.sidebar-right { padding-right: 260px; } .sidebar-right { padding-right: @fluidSidebarWidth + 40; }
// Float the sidebars accordingly // Float the sidebars accordingly
.sidebar-left .fluid-sidebar { float: left; margin-left: -240px; } .sidebar-left .fluid-sidebar { float: left; margin-left: (@fluidSidebarWidth + 20) * -1; }
.sidebar-right .fluid-sidebar { float: right; margin-right: -240px; } .sidebar-right .fluid-sidebar { float: right; margin-right: (@fluidSidebarWidth + 20) * -1; }
// The main content area // The main content area
.fluid-content { .fluid-content {

View File

@ -43,6 +43,9 @@
@gridGutterWidth: 20px; @gridGutterWidth: 20px;
@siteWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)); @siteWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
// Fluid width sidebar
@fluidSidebarWidth: 220px;
// THEME VARIABLES // THEME VARIABLES
// --------------- // ---------------