aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-09-01 00:59:55 -0700
committerMark Otto <[email protected]>2013-09-01 00:59:55 -0700
commit1e68143b39d51dcdbde575120628053c1e3ae966 (patch)
treec74462578517e83edec9f250c759d7c10a3e7279 /dist/css/bootstrap.css
parent4b53ea52e9cc27ab27dde2695400fd6c95a0b6c2 (diff)
parent560753da969a38049a667aefe2ae10a6c61f4386 (diff)
downloadbootstrap-1e68143b39d51dcdbde575120628053c1e3ae966.tar.xz
bootstrap-1e68143b39d51dcdbde575120628053c1e3ae966.zip
Merge pull request #10232 from twbs/table-nesting
use direct-child selector more in table styles to better support nested tables
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css40
1 files changed, 20 insertions, 20 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 10ba482b5..c32604bb8 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -1397,33 +1397,33 @@ th {
margin-bottom: 20px;
}
-.table thead > tr > th,
-.table tbody > tr > th,
-.table tfoot > tr > th,
-.table thead > tr > td,
-.table tbody > tr > td,
-.table tfoot > tr > td {
+.table > thead > tr > th,
+.table > tbody > tr > th,
+.table > tfoot > tr > th,
+.table > thead > tr > td,
+.table > tbody > tr > td,
+.table > tfoot > tr > td {
padding: 8px;
line-height: 1.428571429;
vertical-align: top;
border-top: 1px solid #dddddd;
}
-.table thead > tr > th {
+.table > thead > tr > th {
vertical-align: bottom;
border-bottom: 2px solid #dddddd;
}
-.table caption + thead tr:first-child th,
-.table colgroup + thead tr:first-child th,
-.table thead:first-child tr:first-child th,
-.table caption + thead tr:first-child td,
-.table colgroup + thead tr:first-child td,
-.table thead:first-child tr:first-child td {
+.table > caption + thead > tr:first-child > th,
+.table > colgroup + thead > tr:first-child > th,
+.table > thead:first-child > tr:first-child > th,
+.table > caption + thead > tr:first-child > td,
+.table > colgroup + thead > tr:first-child > td,
+.table > thead:first-child > tr:first-child > td {
border-top: 0;
}
-.table tbody + tbody {
+.table > tbody + tbody {
border-top: 2px solid #dddddd;
}
@@ -1431,12 +1431,12 @@ th {
background-color: #ffffff;
}
-.table-condensed thead > tr > th,
-.table-condensed tbody > tr > th,
-.table-condensed tfoot > tr > th,
-.table-condensed thead > tr > td,
-.table-condensed tbody > tr > td,
-.table-condensed tfoot > tr > td {
+.table-condensed > thead > tr > th,
+.table-condensed > tbody > tr > th,
+.table-condensed > tfoot > tr > th,
+.table-condensed > thead > tr > td,
+.table-condensed > tbody > tr > td,
+.table-condensed > tfoot > tr > td {
padding: 5px;
}