update fluid layout to use variable for sidebar width

diff --git a/bootstrap.css b/bootstrap.css
index 98aec3f27b8dbca1ae4a6fc44028fbe18e3fbd4c..8d80b4adff38466fec4b3ca58799992c72c00ad4 100644 (file)
--- 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 f454b2e91da59d168915ed9e1a0a377ad350a0fa..7432e849ba3e8a81c472be55bd7d9cc4b6497d62 100644 (file)
--- 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 03f1028f85b4f66d76582b14578dcf15aff700ce..dfd773304847217754f3731579bb2e3297c51128 100644 (file)
--- 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
 // ---------------