Commit 3c1a0fbd authored by Mark Otto's avatar Mark Otto

fixes #4103: simpler fix for tfoot in .table-border

parent 89d7ec52
...@@ -1753,6 +1753,35 @@ table { ...@@ -1753,6 +1753,35 @@ table {
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
/* thead:last-child tr:last-child th:first-child,
tbody:last-child tr:last-child td:first-child,
tfoot tr:last-child td:first-child {
-webkit-border-bottom-left-radius: 4px;
border-bottom-left-radius: 4px;
-moz-border-radius-bottomleft: 4px;
}
tfoot ~ tbody:last-child tr:last-child td:first-child {
-webkit-border-bottom-left-radius: 0;
border-bottom-left-radius: 0;
-moz-border-radius-bottomleft: 0;
}
thead:last-child tr:last-child th:last-child,
tbody:last-child tr:last-child td:last-child,
tfoot tr:last-child td:last-child {
-webkit-border-bottom-right-radius: 4px;
border-bottom-right-radius: 4px;
-moz-border-radius-bottomright: 4px;
}
tfoot ~ tbody:last-child tr:last-child td:last-child {
-webkit-border-bottom-right-radius: 0;
border-bottom-right-radius: 0;
-moz-border-radius-bottomright: 0;
}
*/
} }
.table-bordered th, .table-bordered th,
...@@ -1787,7 +1816,8 @@ table { ...@@ -1787,7 +1816,8 @@ table {
} }
.table-bordered thead:last-child tr:last-child th:first-child, .table-bordered thead:last-child tr:last-child th:first-child,
.table-bordered tbody:last-child tr:last-child td:first-child { .table-bordered tbody:last-child tr:last-child td:first-child,
.table-bordered tfoot:last-child tr:last-child td:first-child {
-webkit-border-radius: 0 0 0 4px; -webkit-border-radius: 0 0 0 4px;
-moz-border-radius: 0 0 0 4px; -moz-border-radius: 0 0 0 4px;
border-radius: 0 0 0 4px; border-radius: 0 0 0 4px;
...@@ -1797,7 +1827,8 @@ table { ...@@ -1797,7 +1827,8 @@ table {
} }
.table-bordered thead:last-child tr:last-child th:last-child, .table-bordered thead:last-child tr:last-child th:last-child,
.table-bordered tbody:last-child tr:last-child td:last-child { .table-bordered tbody:last-child tr:last-child td:last-child,
.table-bordered tfoot:last-child tr:last-child td:last-child {
-webkit-border-bottom-right-radius: 4px; -webkit-border-bottom-right-radius: 4px;
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
-moz-border-radius-bottomright: 4px; -moz-border-radius-bottomright: 4px;
......
...@@ -113,20 +113,22 @@ table { ...@@ -113,20 +113,22 @@ table {
} }
// For first th or td in the first row in the first thead or tbody // For first th or td in the first row in the first thead or tbody
thead:last-child tr:last-child th:first-child, thead:last-child tr:last-child th:first-child,
tbody:last-child tr:last-child td:first-child { tbody:last-child tr:last-child td:first-child,
tfoot:last-child tr:last-child td:first-child {
.border-radius(0 0 0 4px); .border-radius(0 0 0 4px);
-webkit-border-bottom-left-radius: 4px; -webkit-border-bottom-left-radius: 4px;
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
-moz-border-radius-bottomleft: 4px; -moz-border-radius-bottomleft: 4px;
} }
thead:last-child tr:last-child th:last-child, thead:last-child tr:last-child th:last-child,
tbody:last-child tr:last-child td:last-child { tbody:last-child tr:last-child td:last-child,
tfoot:last-child tr:last-child td:last-child {
-webkit-border-bottom-right-radius: 4px; -webkit-border-bottom-right-radius: 4px;
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
-moz-border-radius-bottomright: 4px; -moz-border-radius-bottomright: 4px;
} }
// Special fixes to round the left border on the first td/td // Special fixes to round the left border on the first td/th
caption + thead tr:first-child th:first-child, caption + thead tr:first-child th:first-child,
caption + tbody tr:first-child td:first-child, caption + tbody tr:first-child td:first-child,
colgroup + thead tr:first-child th:first-child, colgroup + thead tr:first-child th:first-child,
...@@ -143,6 +145,36 @@ table { ...@@ -143,6 +145,36 @@ table {
border-top-right-radius: 4px; border-top-right-radius: 4px;
-moz-border-right-topleft: 4px; -moz-border-right-topleft: 4px;
} }
// Accounting for tfoot
/* thead:last-child tr:last-child th:first-child,
tbody:last-child tr:last-child td:first-child,
tfoot tr:last-child td:first-child {
-webkit-border-bottom-left-radius: 4px;
border-bottom-left-radius: 4px;
-moz-border-radius-bottomleft: 4px;
}
tfoot ~ tbody:last-child tr:last-child td:first-child {
-webkit-border-bottom-left-radius: 0;
border-bottom-left-radius: 0;
-moz-border-radius-bottomleft: 0;
}
thead:last-child tr:last-child th:last-child,
tbody:last-child tr:last-child td:last-child,
tfoot tr:last-child td:last-child {
-webkit-border-bottom-right-radius: 4px;
border-bottom-right-radius: 4px;
-moz-border-radius-bottomright: 4px;
}
tfoot ~ tbody:last-child tr:last-child td:last-child {
-webkit-border-bottom-right-radius: 0;
border-bottom-right-radius: 0;
-moz-border-radius-bottomright: 0;
}
*/
} }
......
...@@ -404,6 +404,13 @@ ...@@ -404,6 +404,13 @@
<td>3</td> <td>3</td>
</tr> </tr>
</tbody> </tbody>
<tfoot>
<tr>
<td>3</td>
<td>6</td>
<td>9</td>
</tr>
</tfoot>
</table> </table>
<h4>Bordered with thead, with colgroup</h4> <h4>Bordered with thead, with colgroup</h4>
<table class="table table-bordered"> <table class="table table-bordered">
...@@ -414,9 +421,9 @@ ...@@ -414,9 +421,9 @@
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
<td>1</td> <th>A</th>
<td>2</td> <th>B</th>
<td>3</td> <th>C</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -436,6 +443,13 @@ ...@@ -436,6 +443,13 @@
<td>3</td> <td>3</td>
</tr> </tr>
</tbody> </tbody>
<tfoot>
<tr>
<td>3</td>
<td>6</td>
<td>9</td>
</tr>
</tfoot>
</table> </table>
</div><!--/span--> </div><!--/span-->
<div class="span6"> <div class="span6">
...@@ -466,6 +480,13 @@ ...@@ -466,6 +480,13 @@
<td>3</td> <td>3</td>
</tr> </tr>
</tbody> </tbody>
<tfoot>
<tr>
<td>3</td>
<td>6</td>
<td>9</td>
</tr>
</tfoot>
</table> </table>
<h4>Bordered with rowspan and colspan</h4> <h4>Bordered with rowspan and colspan</h4>
<table class="table table-bordered"> <table class="table table-bordered">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment