Skip to content

Commit

Permalink
update docs to streamline the tables section, remove redundant css fo…
Browse files Browse the repository at this point in the history
…r tables to simplify borders
  • Loading branch information
mdo committed Oct 20, 2011
1 parent 6ad0559 commit 35793d9
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 42 deletions.
11 changes: 2 additions & 9 deletions bootstrap.css
Original file line number Diff line number Diff line change
Expand Up @@ -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: Wed Oct 19 22:26:03 PDT 2011
* Date: Wed Oct 19 23:10:57 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).
Expand Down Expand Up @@ -1087,14 +1087,13 @@ table th {
padding-top: 9px;
font-weight: bold;
vertical-align: middle;
border-bottom: 1px solid #ddd;
}
table td {
vertical-align: top;
border-top: 1px solid #ddd;
}
table tbody th {
border-bottom: 0;
border-top: 1px solid #ddd;
vertical-align: top;
}
.bordered-table {
Expand All @@ -1110,12 +1109,6 @@ table tbody th {
.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;
Expand Down
6 changes: 2 additions & 4 deletions bootstrap.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 3 additions & 21 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -888,19 +888,19 @@ <h3>Example: Bordered table</h3>
</thead>
<tbody>
<tr>
<td>1</td>
<th>1</th>
<td>Some</td>
<td>One</td>
<td>English</td>
</tr>
<tr>
<td>2</td>
<th>2</th>
<td>Joe</td>
<td>Sixpack</td>
<td>English</td>
</tr>
<tr>
<td>3</td>
<th>3</th>
<td>Stu</td>
<td>Dent</td>
<td>Code</td>
Expand Down Expand Up @@ -954,24 +954,6 @@ <h3>Example: Zebra-striped</h3>
span 2 columns
</td>
</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>
</table>
<p><strong>Note:</strong> Zebra-striping is a progressive enhancement not available for older browsers like IE8 and below.</p>
Expand Down
9 changes: 1 addition & 8 deletions lib/tables.less
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,14 @@ table {
padding-top: 9px;
font-weight: bold;
vertical-align: middle;
border-bottom: 1px solid #ddd;
}
td {
vertical-align: top;
border-top: 1px solid #ddd;
}
// When scoped to row, fix th in tbody
tbody th {
border-bottom: 0;
border-top: 1px solid #ddd;
vertical-align: top;
}
}
Expand All @@ -49,12 +48,6 @@ table {
th + td {
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,
tbody tr:first-child td:first-child {
.border-radius(4px 0 0 0);
Expand Down

0 comments on commit 35793d9

Please sign in to comment.