diff options
| author | Mark Otto <[email protected]> | 2012-03-11 18:18:18 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-03-11 18:18:18 -0700 |
| commit | 4109c62cf745250e05267c1c5498865b5b548dcf (patch) | |
| tree | 373ff967d02e7fc1189164d99fa07ea16b377e10 | |
| parent | 7154e378b241f753491c1aaf4aba310b7f0f179d (diff) | |
| download | bootstrap-4109c62cf745250e05267c1c5498865b5b548dcf.tar.xz bootstrap-4109c62cf745250e05267c1c5498865b5b548dcf.zip | |
fix table border bug with double borders on theads and use of colgroup
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 55119 -> 55127 bytes | |||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 12 | ||||
| -rw-r--r-- | docs/base-css.html | 4 | ||||
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 4 | ||||
| -rw-r--r-- | less/tables.less | 8 |
5 files changed, 16 insertions, 12 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 8ebb10d4b..b0dcb4e0b 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 2fd7cc135..6fa86fd95 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1174,8 +1174,10 @@ table { .table thead th { vertical-align: bottom; } -.table thead:first-child tr th, -.table thead:first-child tr td { +.table colgroup + thead tr:first-child th, +.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; } .table tbody + tbody { @@ -1198,12 +1200,6 @@ table { .table-bordered td { 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 tbody:first-child tr:first-child td:first-child { -webkit-border-radius: 4px 0 0 0; diff --git a/docs/base-css.html b/docs/base-css.html index 6f1664a82..f8fa8b6ae 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -435,6 +435,10 @@ For example, <code>section</code> should be wrapped as inline. <div class="row"> <div class="span8"> <table class="table table-bordered table-striped"> + <colgroup> + <col class="span1"> + <col class="span7"> + </colgroup> <thead> <tr> <th>Tag</th> diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 417324099..ae45e92e6 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -359,6 +359,10 @@ <div class="row"> <div class="span8"> <table class="table table-bordered table-striped"> + <colgroup> + <col class="span1"> + <col class="span7"> + </colgroup> <thead> <tr> <th>{{_i}}Tag{{/i}}</th> diff --git a/less/tables.less b/less/tables.less index 15318e8f5..22f9a29b9 100644 --- a/less/tables.less +++ b/less/tables.less @@ -37,8 +37,10 @@ table { vertical-align: bottom; } // Remove top border from thead by default - thead:first-child tr th, - thead:first-child tr td { + colgroup + thead tr:first-child th, + colgroup + thead tr:first-child td, + thead:first-child tr:first-child th, + thead:first-child tr:first-child td { border-top: 0; } // Account for multiple tbody instances @@ -77,8 +79,6 @@ table { thead:first-child tr:first-child th, tbody:first-child tr:first-child th, 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 thead:first-child tr:first-child th:first-child, |