diff options
| author | Mark Otto <[email protected]> | 2013-09-01 10:04:54 +0200 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-09-01 10:04:54 +0200 |
| commit | 7f6210cea4f19a2f30892577e27744df02e1458a (patch) | |
| tree | ad5d8c8b504cac1f86f19be8e76d0fc4dc856863 /dist/css/bootstrap.css | |
| parent | 3a4ea1a7bea5a8400672c7e6a47f71b5ea2ee749 (diff) | |
| parent | 1e68143b39d51dcdbde575120628053c1e3ae966 (diff) | |
| download | bootstrap-7f6210cea4f19a2f30892577e27744df02e1458a.tar.xz bootstrap-7f6210cea4f19a2f30892577e27744df02e1458a.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 40 |
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; } |
