diff options
| author | Mark Otto <[email protected]> | 2014-01-18 14:40:17 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-18 14:40:17 -0800 |
| commit | 3b6ab5075e881f6486145f2b3aea22bf53ee44e7 (patch) | |
| tree | c86ff1bb0d1715544241e35371541877e301e25e /dist/css/bootstrap.css | |
| parent | cd1bea0616a8fb1b94d8021bc8dbc0cbc2eaf4aa (diff) | |
| parent | 572e6a959aba6fa905c6377b900566b7ecc7c8f4 (diff) | |
| download | bootstrap-3b6ab5075e881f6486145f2b3aea22bf53ee44e7.tar.xz bootstrap-3b6ab5075e881f6486145f2b3aea22bf53ee44e7.zip | |
Merge branch 'master' into bg-variant
Conflicts:
less/mixins.less
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 78 |
1 files changed, 60 insertions, 18 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 26257d194..26fe5b2e3 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4771,14 +4771,22 @@ a.list-group-item-danger.active:focus { } .panel > .list-group .list-group-item { border-width: 1px 0; + border-radius: 0; } .panel > .list-group .list-group-item:first-child { - border-top-left-radius: 0; - border-top-right-radius: 0; + border-top: 0; } .panel > .list-group .list-group-item:last-child { border-bottom: 0; } +.panel > .list-group:first-child .list-group-item:first-child { + border-top-left-radius: 3px; + border-top-right-radius: 3px; +} +.panel > .list-group:last-child .list-group-item:last-child { + border-bottom-right-radius: 3px; + border-bottom-left-radius: 3px; +} .panel-heading + .list-group .list-group-item:first-child { border-top-width: 0; } @@ -4786,24 +4794,44 @@ a.list-group-item-danger.active:focus { .panel > .table-responsive > .table { margin-bottom: 0; } -.panel > .table > tbody:last-child > tr:last-child td:first-child, -.panel > .table-responsive > .table > tbody:last-child > tr:last-child td:first-child, -.panel > .table > tfoot:last-child > tr:last-child td:first-child, -.panel > .table-responsive > .table > tfoot:last-child > tr:last-child td:first-child, -.panel > .table > tbody:last-child > tr:last-child th:first-child, -.panel > .table-responsive > .table > tbody:last-child > tr:last-child th:first-child, -.panel > .table > tfoot:last-child > tr:last-child th:first-child, -.panel > .table-responsive > .table > tfoot:last-child > tr:last-child th:first-child { +.panel > .table:first-child > thead:first-child > tr:first-child td:first-child, +.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child, +.panel > .table:first-child > tbody:first-child > tr:first-child td:first-child, +.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child, +.panel > .table:first-child > thead:first-child > tr:first-child th:first-child, +.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child, +.panel > .table:first-child > tbody:first-child > tr:first-child th:first-child, +.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child { + border-top-left-radius: 3px; +} +.panel > .table:first-child > thead:first-child > tr:first-child td:last-child, +.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child, +.panel > .table:first-child > tbody:first-child > tr:first-child td:last-child, +.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child, +.panel > .table:first-child > thead:first-child > tr:first-child th:last-child, +.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child, +.panel > .table:first-child > tbody:first-child > tr:first-child th:last-child, +.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child { + border-top-right-radius: 3px; +} +.panel > .table:last-child > tbody:last-child > tr:last-child td:first-child, +.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child, +.panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child, +.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child, +.panel > .table:last-child > tbody:last-child > tr:last-child th:first-child, +.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child, +.panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child, +.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child { border-bottom-left-radius: 3px; } -.panel > .table > tbody:last-child > tr:last-child td:last-child, -.panel > .table-responsive > .table > tbody:last-child > tr:last-child td:last-child, -.panel > .table > tfoot:last-child > tr:last-child td:last-child, -.panel > .table-responsive > .table > tfoot:last-child > tr:last-child td:last-child, -.panel > .table > tbody:last-child > tr:last-child th:last-child, -.panel > .table-responsive > .table > tbody:last-child > tr:last-child th:last-child, -.panel > .table > tfoot:last-child > tr:last-child th:last-child, -.panel > .table-responsive > .table > tfoot:last-child > tr:last-child th:last-child { +.panel > .table:last-child > tbody:last-child > tr:last-child td:last-child, +.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child, +.panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child, +.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child, +.panel > .table:last-child > tbody:last-child > tr:last-child th:last-child, +.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child, +.panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child, +.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child { border-bottom-right-radius: 3px; } .panel > .panel-body + .table, @@ -4846,6 +4874,20 @@ a.list-group-item-danger.active:focus { .panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child { border-right: 0; } +.panel > .table-bordered > thead > tr:first-child > th, +.panel > .table-responsive > .table-bordered > thead > tr:first-child > th, +.panel > .table-bordered > tbody > tr:first-child > th, +.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th, +.panel > .table-bordered > tfoot > tr:first-child > th, +.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > th, +.panel > .table-bordered > thead > tr:first-child > td, +.panel > .table-responsive > .table-bordered > thead > tr:first-child > td, +.panel > .table-bordered > tbody > tr:first-child > td, +.panel > .table-responsive > .table-bordered > tbody > tr:first-child > td, +.panel > .table-bordered > tfoot > tr:first-child > td, +.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > td { + border-top: 0; +} .panel > .table-bordered > thead > tr:last-child > th, .panel > .table-responsive > .table-bordered > thead > tr:last-child > th, .panel > .table-bordered > tbody > tr:last-child > th, |
