resolve problem with nested tables having double borders

mdo · mdo · commit 9991f3faa148 · 2011-10-07T23:53:32.000-07:00
diff --git 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: Tue Oct  4 01:16:04 PDT 2011
+ * Date: Fri Oct  7 23:53:08 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).
@@ -1083,9 +1083,12 @@ table td {
 table th + th, table td + td {
   border-left: 1px solid #ddd;
 }
-table tr + tr td {
+table tr td {
   border-top: 1px solid #ddd;
 }
+table tr:first-child td {
+  border-top: 0;
+}
 table tbody tr:first-child td:first-child {
   -webkit-border-radius: 4px 0 0 0;
   -moz-border-radius: 4px 0 0 0;
diff --git a/bootstrap.min.css b/bootstrap.min.css
diff --git a/docs/index.html b/docs/index.html
@@ -869,6 +869,53 @@ <h3>Example: Default table styles</h3>
             <td>Dent</td>
             <td>Code</td>
           </tr>
+          <tr>
+            <td colspan="4">
+              span 4 columns
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">
+              span 2 columns
+            </td>
+            <td colspan="2">
+              span 2 columns
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">
+              <table>
+                <thead>
+                  <tr>
+                    <th>1</th>
+                    <th>2</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr>
+                    <td>1</td>
+                    <td>2</td>
+                  </tr>
+                </tbody>
+              </table>
+            </td>
+            <td colspan="2">
+              <table>
+                <thead>
+                  <tr>
+                    <th>1</th>
+                    <th>2</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr>
+                    <td>1</td>
+                    <td>2</td>
+                  </tr>
+                </tbody>
+              </table>
+            </td>
+          </tr>
         </tbody>
       </table>
 <pre class="prettyprint linenums">
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
@@ -77,7 +77,7 @@ a {
 
 .row {
   .clearfix();
-  margin-left: -1 * @gridGutterWidth;
+  margin-left: -@gridGutterWidth;
 }
 
 // Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7)
diff --git a/lib/tables.less b/lib/tables.less
@@ -34,9 +34,12 @@ table {
   td + td {
     border-left: 1px solid #ddd;
   }
-  tr + tr td {
+  tr td {
     border-top: 1px solid #ddd;
   }
+  tr:first-child td {
+    border-top: 0;
+  }
   tbody tr:first-child td:first-child {
     .border-radius(4px 0 0 0);
   }

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ a {`
`77`	`77`
`78`	`78`	`.row {`
`79`	`79`	`.clearfix();`
`80`		`- margin-left: -1 * @gridGutterWidth;`
	`80`	`+ margin-left: -@gridGutterWidth;`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`// Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7)`
Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,12 @@ table {`
`34`	`34`	`td + td {`
`35`	`35`	`border-left: 1px solid #ddd;`
`36`	`36`	`}`
`37`		`- tr + tr td {`
	`37`	`+ tr td {`
`38`	`38`	`border-top: 1px solid #ddd;`
`39`	`39`	`}`
	`40`	`+ tr:first-child td {`
	`41`	`+ border-top: 0;`
	`42`	`+ }`
`40`	`43`	`tbody tr:first-child td:first-child {`
`41`	`44`	`.border-radius(4px 0 0 0);`
`42`	`45`	`}`