kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

fix table border bug with double borders on theads and use of colgroup

This commit is contained in:
Mark Otto 2012-03-11 18:18:18 -07:00
parent 7154e378b2
commit 4109c62cf7
5 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

12
docs/assets/css/bootstrap.css vendored
View File

@ -1174,8 +1174,10 @@ table {
.table thead th { .table thead th {
vertical-align: bottom; vertical-align: bottom;
} }
.table thead:first-child tr th, .table colgroup + thead tr:first-child th,
.table thead:first-child tr td { .table colgroup + thead tr:first-child td,
.table thead:first-child tr:first-child th,
.table thead:first-child tr:first-child td {
border-top: 0; border-top: 0;
} }
.table tbody + tbody { .table tbody + tbody {
@ -1198,12 +1200,6 @@ table {
.table-bordered td { .table-bordered td {
border-left: 1px solid #dddddd; border-left: 1px solid #dddddd;
} }
.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 td {
border-top: 0;
border-bottom: 1px solid #dddddd;
}
.table-bordered thead:first-child tr:first-child th:first-child, .table-bordered thead:first-child tr:first-child th:first-child,
.table-bordered tbody:first-child tr:first-child td:first-child { .table-bordered tbody:first-child tr:first-child td:first-child {
-webkit-border-radius: 4px 0 0 0; -webkit-border-radius: 4px 0 0 0;

4
docs/base-css.html
View File

@ -435,6 +435,10 @@ For example, <code>section</code> should be wrapped as inline.
<div class="row"> <div class="row">
<div class="span8"> <div class="span8">
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped">
<colgroup>
<col class="span1">
<col class="span7">
</colgroup>
<thead> <thead>
<tr> <tr>
<th>Tag</th> <th>Tag</th>

4
docs/templates/pages/base-css.mustache vendored
View File

@ -359,6 +359,10 @@
<div class="row"> <div class="row">
<div class="span8"> <div class="span8">
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped">
<colgroup>
<col class="span1">
<col class="span7">
</colgroup>
<thead> <thead>
<tr> <tr>
<th>{{_i}}Tag{{/i}}</th> <th>{{_i}}Tag{{/i}}</th>

8
less/tables.less
View File

@ -37,8 +37,10 @@ table {
vertical-align: bottom; vertical-align: bottom;
} }
// Remove top border from thead by default // Remove top border from thead by default
thead:first-child tr th, colgroup + thead tr:first-child th,
thead:first-child tr td { colgroup + thead tr:first-child td,
thead:first-child tr:first-child th,
thead:first-child tr:first-child td {
border-top: 0; border-top: 0;
} }
// Account for multiple tbody instances // Account for multiple tbody instances
@ -77,8 +79,6 @@ table {
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 {
border-top: 0;
border-bottom: 1px solid @tableBorder;
} }
// 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:first-child tr:first-child th:first-child, thead:first-child tr:first-child th:first-child,