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

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 8ebb10d4b1e7855dc46dadf652d9a3a4f4aa02e0..b0dcb4e0be636fc1128a31d126b45fb532643784 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 2fd7cc135c8537d564012fdc30af284e7269c6e2..6fa86fd952a1771b8677d9a7ee9b34ea73a3e4ff 100644 (file)
--- 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 6f1664a829a37081eced12ec7503035921fb8643..f8fa8b6aee5695558ab5b0d6bf45956f20630086 100644 (file)
--- 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 41732409963c84b1913ce5c88c1aad20ee18b187..ae45e92e616a03f38a78b0df92bef52b73b2e146 100644 (file)
--- 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 15318e8f5a12777787f3fa8a78221db773c92697..22f9a29b90dbecc141938fb1df690e7d958050d3 100644 (file)
--- 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,