updated table styles a bit and floated the fluid columns to clear the row dropping problem we were having

mdo · mdo · commit b188c0da8b51 · 2011-09-16T09:41:58.000-07:00
diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.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: Wed Sep 14 08:56:48 PDT 2011
+ * Date: Thu Sep 15 09:29:41 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).
@@ -226,19 +226,10 @@ body {
   width: 220px;
 }
 .container-fluid > .content {
+  float: left;
   min-width: 700px;
   max-width: 1180px;
-  margin-left: 240px;
-  zoom: 1;
-}
-.container-fluid > .content:before, .container-fluid > .content:after {
-  display: table;
-  content: "";
-  zoom: 1;
-  *display: inline;
-}
-.container-fluid > .content:after {
-  clear: both;
+  margin-left: 20px;
 }
 .hide {
   display: none;
@@ -1101,6 +1092,9 @@ table {
   margin-bottom: 18px;
   padding: 0;
   border-collapse: separate;
+  *border-collapse: collapse;
+  /* IE7, collapse table to remove spacing */
+
   font-size: 13px;
   border: 1px solid #ddd;
   -webkit-border-radius: 4px;
diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
@@ -22,6 +22,7 @@ section > .row {
 /* Jumbotrons
 -------------------------------------------------- */
 .jumbotron {
+  min-width: 940px;
   padding-top: 40px;
 }
 .jumbotron .inner {
@@ -98,6 +99,7 @@ section > .row {
 -------------------------------------------------- */
 .footer {
   background-color: #eee;
+  min-width: 940px;
   padding: 30px 0;
   text-shadow: 0 1px 0 #fff;
   border-top: 1px solid #e5e5e5;
diff --git a/examples/fluid.html b/examples/fluid.html
@@ -71,9 +71,13 @@ <h5>Sidebar</h5>
       <div class="content">
         <!-- Main hero unit for a primary marketing message or call to action -->
         <div class="row">
-<div class="span4">a</div>
-<div class="span12">b</div>
-</div>
+          <div class="span4">a</div>
+          <div class="span12">b</div>
+        </div>
+        <div class="row">
+          <div class="span4">a</div>
+          <div class="span12">b</div>
+        </div>
         <!-- Example row of columns -->
         <div class="row">
           <div class="span6">
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
@@ -33,17 +33,17 @@ body {
   }
   // TODO in v2: rename this and .popover .content to be more specific
   > .content {
+    float: left;
     min-width: 700px;
     max-width: 1180px;
-    margin-left: 240px;
-    .clearfix();
+    margin-left: 20px;
   }
 }
 
+// Toggling content
 .hide {
   display: none;
 }
-
 .show {
   display: block;
 }
diff --git a/lib/tables.less b/lib/tables.less
@@ -11,7 +11,8 @@ table {
   width: 100%;
   margin-bottom: @baseline;
   padding: 0;
-  border-collapse: separate;
+  border-collapse: separate; // Done so we can round those corners!
+  *border-collapse: collapse; /* IE7, collapse table to remove spacing */
   font-size: @basefont;
   border: 1px solid #ddd;
   .border-radius(4px);

Original file line number	Diff line number	Diff line change
`@@ -33,17 +33,17 @@ body {`
`33`	`33`	`}`
`34`	`34`	`// TODO in v2: rename this and .popover .content to be more specific`
`35`	`35`	`> .content {`
	`36`	`+ float: left;`
`36`	`37`	`min-width: 700px;`
`37`	`38`	`max-width: 1180px;`
`38`		`- margin-left: 240px;`
`39`		`- .clearfix();`
	`39`	`+ margin-left: 20px;`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
	`43`	`+// Toggling content`
`43`	`44`	`.hide {`
`44`	`45`	`display: none;`
`45`	`46`	`}`
`46`		`-`
`47`	`47`	`.show {`
`48`	`48`	`display: block;`
`49`	`49`	`}`