0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00

update docs to streamline the tables section, remove redundant css for tables to simplify borders

This commit is contained in:
Mark Otto 2011-10-19 23:11:22 -07:00
parent 6ad0559e0f
commit 35793d98e7
4 changed files with 8 additions and 42 deletions

11
bootstrap.css vendored
View File

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Wed Oct 19 22:26:03 PDT 2011 * Date: Wed Oct 19 23:10:57 PDT 2011
*/ */
/* Reset.less /* 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). * 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).
@ -1087,14 +1087,13 @@ table th {
padding-top: 9px; padding-top: 9px;
font-weight: bold; font-weight: bold;
vertical-align: middle; vertical-align: middle;
border-bottom: 1px solid #ddd;
} }
table td { table td {
vertical-align: top; vertical-align: top;
border-top: 1px solid #ddd; border-top: 1px solid #ddd;
} }
table tbody th { table tbody th {
border-bottom: 0; border-top: 1px solid #ddd;
vertical-align: top; vertical-align: top;
} }
.bordered-table { .bordered-table {
@ -1110,12 +1109,6 @@ table tbody th {
.bordered-table th + th, .bordered-table td + td, .bordered-table th + td { .bordered-table th + th, .bordered-table td + td, .bordered-table th + td {
border-left: 1px solid #ddd; border-left: 1px solid #ddd;
} }
.bordered-table tr td {
border-top: 1px solid #ddd;
}
.bordered-table tr:first-child td {
border-top: 0;
}
.bordered-table thead tr:first-child th:first-child, .bordered-table tbody tr:first-child td:first-child { .bordered-table thead tr:first-child th:first-child, .bordered-table tbody tr:first-child td:first-child {
-webkit-border-radius: 4px 0 0 0; -webkit-border-radius: 4px 0 0 0;
-moz-border-radius: 4px 0 0 0; -moz-border-radius: 4px 0 0 0;

6
bootstrap.min.css vendored
View File

@ -185,12 +185,10 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado
.form-stacked div.clearfix.error{padding-top:10px;padding-bottom:10px;padding-left:10px;margin-top:0;margin-left:-10px;} .form-stacked div.clearfix.error{padding-top:10px;padding-bottom:10px;padding-left:10px;margin-top:0;margin-left:-10px;}
.form-stacked .actions{margin-left:-20px;padding-left:20px;} .form-stacked .actions{margin-left:-20px;padding-left:20px;}
table{width:100%;margin-bottom:18px;padding:0;font-size:13px;border-collapse:collapse;}table th,table td{padding:10px 10px 9px;line-height:18px;text-align:left;} table{width:100%;margin-bottom:18px;padding:0;font-size:13px;border-collapse:collapse;}table th,table td{padding:10px 10px 9px;line-height:18px;text-align:left;}
table th{padding-top:9px;font-weight:bold;vertical-align:middle;border-bottom:1px solid #ddd;} table th{padding-top:9px;font-weight:bold;vertical-align:middle;}
table td{vertical-align:top;border-top:1px solid #ddd;} table td{vertical-align:top;border-top:1px solid #ddd;}
table tbody th{border-bottom:0;vertical-align:top;} table tbody th{border-top:1px solid #ddd;vertical-align:top;}
.bordered-table{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapse;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.bordered-table th+th,.bordered-table td+td,.bordered-table th+td{border-left:1px solid #ddd;} .bordered-table{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapse;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.bordered-table th+th,.bordered-table td+td,.bordered-table th+td{border-left:1px solid #ddd;}
.bordered-table tr td{border-top:1px solid #ddd;}
.bordered-table tr:first-child td{border-top:0;}
.bordered-table thead tr:first-child th:first-child,.bordered-table tbody tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;} .bordered-table thead tr:first-child th:first-child,.bordered-table tbody tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;}
.bordered-table thead tr:first-child th:last-child,.bordered-table tbody tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;-moz-border-radius:0 4px 0 0;border-radius:0 4px 0 0;} .bordered-table thead tr:first-child th:last-child,.bordered-table tbody tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;-moz-border-radius:0 4px 0 0;border-radius:0 4px 0 0;}
.bordered-table tbody 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;} .bordered-table tbody 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;}

View File

@ -888,19 +888,19 @@
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td>1</td> <th>1</th>
<td>Some</td> <td>Some</td>
<td>One</td> <td>One</td>
<td>English</td> <td>English</td>
</tr> </tr>
<tr> <tr>
<td>2</td> <th>2</th>
<td>Joe</td> <td>Joe</td>
<td>Sixpack</td> <td>Sixpack</td>
<td>English</td> <td>English</td>
</tr> </tr>
<tr> <tr>
<td>3</td> <th>3</th>
<td>Stu</td> <td>Stu</td>
<td>Dent</td> <td>Dent</td>
<td>Code</td> <td>Code</td>
@ -954,24 +954,6 @@
span 2 columns span 2 columns
</td> </td>
</tr> </tr>
<tr>
<td colspan="4">
<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> </tbody>
</table> </table>
<p><strong>Note:</strong> Zebra-striping is a progressive enhancement not available for older browsers like IE8 and below.</p> <p><strong>Note:</strong> Zebra-striping is a progressive enhancement not available for older browsers like IE8 and below.</p>

View File

@ -22,7 +22,6 @@ table {
padding-top: 9px; padding-top: 9px;
font-weight: bold; font-weight: bold;
vertical-align: middle; vertical-align: middle;
border-bottom: 1px solid #ddd;
} }
td { td {
vertical-align: top; vertical-align: top;
@ -30,7 +29,7 @@ table {
} }
// When scoped to row, fix th in tbody // When scoped to row, fix th in tbody
tbody th { tbody th {
border-bottom: 0; border-top: 1px solid #ddd;
vertical-align: top; vertical-align: top;
} }
} }
@ -49,12 +48,6 @@ table {
th + td { th + td {
border-left: 1px solid #ddd; border-left: 1px solid #ddd;
} }
tr td {
border-top: 1px solid #ddd;
}
tr:first-child td {
border-top: 0;
}
thead tr:first-child th:first-child, thead tr:first-child th:first-child,
tbody tr:first-child td:first-child { tbody tr:first-child td:first-child {
.border-radius(4px 0 0 0); .border-radius(4px 0 0 0);