Skip to content

B
bootstrap
Commit de7aee24 authored by Mark Otto's avatar Mark Otto
Browse files
Options

fix broken tables with double borders and such, add css tests page to start with table edge cases

parent 622b8fa3
Hide whitespace changes
Inline Side-by-side
Showing with 376 additions and 4 deletions
docs/assets/css/bootstrap.css
View file @ de7aee24
...@@ -1237,6 +1237,12 @@ table { ...@@ -1237,6 +1237,12 @@ table {
.table-bordered td { .table-bordered td {
border-left: 1px solid #dddddd; border-left: 1px solid #dddddd;
} }
.table-bordered caption + thead tr:first-child th,
.table-bordered caption + tbody tr:first-child th,
.table-bordered caption + tbody tr:first-child td,
.table-bordered colgroup + thead tr:first-child th,
.table-bordered colgroup + tbody tr:first-child th,
.table-bordered colgroup + tbody tr:first-child td,
.table-bordered thead:first-child tr:first-child th, .table-bordered thead:first-child tr:first-child th,
.table-bordered tbody:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child th,
.table-bordered tbody:first-child tr:first-child td { .table-bordered tbody:first-child tr:first-child td {
......
docs/css-tests.html
View file @ de7aee24
...@@ -74,13 +74,193 @@ ...@@ -74,13 +74,193 @@
<div class="container"> <div class="container">
<style>
body {
background-image: none;
}
.col1 {
background-color: rgba(255,0,0,.1);
}
.col2 {
background-color: rgba(0,255,0,.1);
}
.col3 {
background-color: rgba(0,0,255,.1);
}
</style>
<!-- Masthead <!-- Masthead
================================================== --> ================================================== -->
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
<h1>Tests</h1> <h1>CSS Tests</h1>
<p class="lead"></p> <p class="lead">One stop shop for quick debugging and edge-case tests of CSS.</p>
</header> </header>
<div class="page-header">
<h1>Tables</h1>
</div>
<div class="row">
<div class="span6">
<h4>Bordered without thead</h4>
<table class="table table-bordered">
<tbody>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
</tbody>
</table>
<h4>Bordered without thead, with caption</h4>
<table class="table table-bordered">
<caption>Table caption</caption>
<tbody>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
</tbody>
</table>
<h4>Bordered without thead, with colgroup</h4>
<table class="table table-bordered">
<colgroup>
<col class="col1">
<col class="col2">
<col class="col3">
</colgroup>
<tbody>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
</tbody>
</table>
<h4>Bordered with thead, with colgroup</h4>
<table class="table table-bordered">
<colgroup>
<col class="col1">
<col class="col2">
<col class="col3">
</colgroup>
<thead>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
</thead>
<tbody>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
</tbody>
</table>
</div><!--/span-->
<div class="span6">
<h4>Bordered with thead and caption</h4>
<table class="table table-bordered">
<caption>Table caption</caption>
<thead>
<tr>
<th>1</th>
<th>2</th>
<th>3</th>
</tr>
</thead>
<tbody>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
</tbody>
</table>
<h4>Bordered with rowspan and colspan</h4>
<table class="table table-bordered">
<thead>
<tr>
<th>1</th>
<th>2</th>
<th>3</th>
</tr>
</thead>
<tbody>
<tr>
<td colspan="2">1 and 2</td>
<td>3</td>
</tr>
<tr>
<td>1</td>
<td rowspan="2">2</td>
<td>3</td>
</tr>
<tr>
<td rowspan="2">1</td>
<td>3</td>
</tr>
<tr>
<td colspan="2">2 and 3</td>
</tr>
</tbody>
</table>
</div><!--/span-->
</div><!--/row-->
<!-- Footer <!-- Footer
================================================== --> ================================================== -->
......
docs/templates/pages/css-tests.mustache
View file @ de7aee24
<style>
body {
background-image: none;
}
.col1 {
background-color: rgba(255,0,0,.1);
}
.col2 {
background-color: rgba(0,255,0,.1);
}
.col3 {
background-color: rgba(0,0,255,.1);
}
</style>
<!-- Masthead <!-- Masthead
================================================== --> ================================================== -->
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
<h1>{{_i}}Tests{{/i}}</h1> <h1>{{_i}}CSS Tests{{/i}}</h1>
<p class="lead">{{_i}}{{/i}}</p> <p class="lead">{{_i}}One stop shop for quick debugging and edge-case tests of CSS.{{/i}}</p>
</header> </header>
<div class="page-header">
<h1>Tables</h1>
</div>
<div class="row">
<div class="span6">
<h4>Bordered without thead</h4>
<table class="table table-bordered">
<tbody>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
</tbody>
</table>
<h4>Bordered without thead, with caption</h4>
<table class="table table-bordered">
<caption>Table caption</caption>
<tbody>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
</tbody>
</table>
<h4>Bordered without thead, with colgroup</h4>
<table class="table table-bordered">
<colgroup>
<col class="col1">
<col class="col2">
<col class="col3">
</colgroup>
<tbody>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
</tbody>
</table>
<h4>Bordered with thead, with colgroup</h4>
<table class="table table-bordered">
<colgroup>
<col class="col1">
<col class="col2">
<col class="col3">
</colgroup>
<thead>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
</thead>
<tbody>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
</tbody>
</table>
</div><!--/span-->
<div class="span6">
<h4>Bordered with thead and caption</h4>
<table class="table table-bordered">
<caption>Table caption</caption>
<thead>
<tr>
<th>1</th>
<th>2</th>
<th>3</th>
</tr>
</thead>
<tbody>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
</tr>
</tbody>
</table>
<h4>Bordered with rowspan and colspan</h4>
<table class="table table-bordered">
<thead>
<tr>
<th>1</th>
<th>2</th>
<th>3</th>
</tr>
</thead>
<tbody>
<tr>
<td colspan="2">1 and 2</td>
<td>3</td>
</tr>
<tr>
<td>1</td>
<td rowspan="2">2</td>
<td>3</td>
</tr>
<tr>
<td rowspan="2">1</td>
<td>3</td>
</tr>
<tr>
<td colspan="2">2 and 3</td>
</tr>
</tbody>
</table>
</div><!--/span-->
</div><!--/row-->
less/tables.less
View file @ de7aee24
...@@ -78,6 +78,12 @@ table { ...@@ -78,6 +78,12 @@ table {
border-left: 1px solid @tableBorder; border-left: 1px solid @tableBorder;
} }
// Prevent a double border // Prevent a double border
caption + thead tr:first-child th,
caption + tbody tr:first-child th,
caption + tbody tr:first-child td,
colgroup + thead tr:first-child th,
colgroup + tbody tr:first-child th,
colgroup + tbody tr:first-child td,
thead:first-child tr:first-child th, thead:first-child tr:first-child th,
tbody:first-child tr:first-child th, tbody:first-child tr:first-child th,
tbody:first-child tr:first-child td { tbody:first-child tr:first-child td {
......
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