diff options
| -rw-r--r-- | docs/assets/css/bootstrap.css | 35 | ||||
| -rw-r--r-- | less/tables.less | 38 | ||||
| -rw-r--r-- | less/tests/css-tests.html | 27 |
3 files changed, 92 insertions, 8 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b9ea3b7d0..bc52f0f86 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1753,6 +1753,35 @@ table { -webkit-border-radius: 4px; -moz-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, @@ -1787,7 +1816,8 @@ table { } .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; -moz-border-radius: 0 0 0 4px; border-radius: 0 0 0 4px; @@ -1797,7 +1827,8 @@ table { } .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; border-bottom-right-radius: 4px; -moz-border-radius-bottomright: 4px; diff --git a/less/tables.less b/less/tables.less index 4db484062..2ccca8689 100644 --- a/less/tables.less +++ b/less/tables.less @@ -113,20 +113,22 @@ table { } // For first th or td in the first row in the first thead or tbody 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); -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; -moz-border-radius-bottomleft: 4px; } 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; border-bottom-right-radius: 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 + tbody tr:first-child td:first-child, colgroup + thead tr:first-child th:first-child, @@ -143,6 +145,36 @@ table { border-top-right-radius: 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; + } +*/ } diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html index 527e96616..81d5b1896 100644 --- a/less/tests/css-tests.html +++ b/less/tests/css-tests.html @@ -404,6 +404,13 @@ <td>3</td> </tr> </tbody> + <tfoot> + <tr> + <td>3</td> + <td>6</td> + <td>9</td> + </tr> + </tfoot> </table> <h4>Bordered with thead, with colgroup</h4> <table class="table table-bordered"> @@ -414,9 +421,9 @@ </colgroup> <thead> <tr> - <td>1</td> - <td>2</td> - <td>3</td> + <th>A</th> + <th>B</th> + <th>C</th> </tr> </thead> <tbody> @@ -436,6 +443,13 @@ <td>3</td> </tr> </tbody> + <tfoot> + <tr> + <td>3</td> + <td>6</td> + <td>9</td> + </tr> + </tfoot> </table> </div><!--/span--> <div class="span6"> @@ -466,6 +480,13 @@ <td>3</td> </tr> </tbody> + <tfoot> + <tr> + <td>3</td> + <td>6</td> + <td>9</td> + </tr> + </tfoot> </table> <h4>Bordered with rowspan and colspan</h4> <table class="table table-bordered"> |