fix fluid example

diff --git a/bootstrap.css b/bootstrap.css
index 117f510f4ac9078d5ea1d35de0d8a3d54e72a71c..8b6fe3eb42c6cf55897124d66ecdc9b95b4d64f9 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: Fri Sep 16 11:24:41 PDT 2011
+ * Date: Fri Sep 16 14:07:03 PDT 2011
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here      that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -208,6 +208,7 @@ body {
 }
 .container-fluid {
   position: relative;
+  min-width: 940px;
   padding-left: 20px;
   padding-right: 20px;
   zoom: 1;
@@ -226,16 +227,7 @@ body {
   width: 220px;
 }
 .container-fluid > .content {
-  float: left;
-  min-width: 700px;
-  max-width: 1180px;
-  margin-left: 20px;
-}
-.hide {
-  display: none;
-}
-.show {
-  display: block;
+  margin-left: 240px;
 }
 a {
   color: #0069d6;
@@ -253,6 +245,12 @@ a:hover {
 .pull-left {
   float: left;
 }
+.hide {
+  display: none;
+}
+.show {
+  display: block;
+}
 .row {
   zoom: 1;
   margin-left: -20px;

diff --git a/bootstrap.min.css b/bootstrap.min.css
index e9ddd96fc3ae8e6bb06a3a323e11c5fea9c36e57..aabdf2428b30d9932a884c217d76dacef29f230e 100644 (file)
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -24,15 +24,15 @@ html,body{background-color:#ffffff;}
 body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#404040;}
 .container{width:940px;margin-left:auto;margin-right:auto;zoom:1;}.container:before,.container:after{display:table;content:"";zoom:1;*display:inline;}
 .container:after{clear:both;}
-.container-fluid{position:relative;padding-left:20px;padding-right:20px;zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";zoom:1;*display:inline;}
+.container-fluid{position:relative;min-width:940px;padding-left:20px;padding-right:20px;zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";zoom:1;*display:inline;}
 .container-fluid:after{clear:both;}
 .container-fluid>.sidebar{float:left;width:220px;}
-.container-fluid>.content{float:left;min-width:700px;max-width:1180px;margin-left:20px;}
-.hide{display:none;}
-.show{display:block;}
+.container-fluid>.content{margin-left:240px;}
 a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#00438a;text-decoration:underline;}
 .pull-right{float:right;}
 .pull-left{float:left;}
+.hide{display:none;}
+.show{display:block;}
 .row{zoom:1;margin-left:-20px;}.row:before,.row:after{display:table;content:"";zoom:1;*display:inline;}
 .row:after{clear:both;}
 [class*="span"]{display:inline;float:left;margin-left:20px;}

diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index aede36e53fb7e2fb64e07bfc661b3680d829ea80..26bb0cc059977a654606cd62222dd1bbdf50f04e 100644 (file)
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -24,6 +24,7 @@ body {
 // Fluid layouts (left aligned, with sidebar, min- & max-width content)
 .container-fluid {
   position: relative;
+  min-width: 940px;
   padding-left: 20px;
   padding-right: 20px;
   .clearfix();
@@ -33,21 +34,10 @@ body {
   }
   // TODO in v2: rename this and .popover .content to be more specific
   > .content {
-    float: left;
-    min-width: 700px;
-    max-width: 1180px;
-    margin-left: 20px;
+    margin-left: 240px;
   }
 }
 
-// Toggling content
-.hide {
-  display: none;
-}
-.show {
-  display: block;
-}
-
 
 // BASE STYLES
 // -----------
@@ -72,6 +62,14 @@ a {
   float: left;
 }
 
+// Toggling content
+.hide {
+  display: none;
+}
+.show {
+  display: block;
+}
+
 
 // GRID SYSTEM
 // -----------