Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <markotto@twitter.com>2012-03-12 05:18:18 +0400
committerMark Otto <markotto@twitter.com>2012-03-12 05:18:18 +0400
commit4109c62cf745250e05267c1c5498865b5b548dcf (patch)
tree373ff967d02e7fc1189164d99fa07ea16b377e10 /docs
parent7154e378b241f753491c1aaf4aba310b7f0f179d (diff)
fix table border bug with double borders on theads and use of colgroup
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/bootstrap.zipbin55119 -> 55127 bytes
-rw-r--r--docs/assets/css/bootstrap.css12
-rw-r--r--docs/base-css.html4
-rw-r--r--docs/templates/pages/base-css.mustache4
4 files changed, 12 insertions, 8 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 8ebb10d4b1..b0dcb4e0be 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 2fd7cc135c..6fa86fd952 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 6f1664a829..f8fa8b6aee 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -435,6 +435,10 @@ For example, &lt;code&gt;section&lt;/code&gt; 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 4173240996..ae45e92e61 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>