Skip to content

B
bootstrap
Commit 28e5572b authored by Mark Otto's avatar Mark Otto
Browse files
Options

Fixes #10492: Account for responsive tables in panels

parent 682ee3ab
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 10 deletions
dist/css/bootstrap.css
View file @ 28e5572b
...@@ -5431,42 +5431,63 @@ a.list-group-item:focus { ...@@ -5431,42 +5431,63 @@ a.list-group-item:focus {
border-top-width: 0; border-top-width: 0;
} }
.panel > .table { .panel > .table,
.panel > .table-responsive {
margin-bottom: 0; margin-bottom: 0;
} }
.panel > .panel-body + .table { .panel > .panel-body + .table,
.panel > .panel-body + .table-responsive {
border-top: 1px solid #dddddd; border-top: 1px solid #dddddd;
} }
.panel > .table-bordered { .panel > .table-bordered,
.panel > .table-responsive > .table-bordered {
border: 0; border: 0;
} }
.panel > .table-bordered > thead > tr > th:first-child, .panel > .table-bordered > thead > tr > th:first-child,
.panel > .table-responsive > .table-bordered > thead > tr > th:first-child,
.panel > .table-bordered > tbody > tr > th:first-child, .panel > .table-bordered > tbody > tr > th:first-child,
.panel > .table-responsive > .table-bordered > tbody > tr > th:first-child,
.panel > .table-bordered > tfoot > tr > th:first-child, .panel > .table-bordered > tfoot > tr > th:first-child,
.panel > .table-responsive > .table-bordered > tfoot > tr > th:first-child,
.panel > .table-bordered > thead > tr > td:first-child, .panel > .table-bordered > thead > tr > td:first-child,
.panel > .table-responsive > .table-bordered > thead > tr > td:first-child,
.panel > .table-bordered > tbody > tr > td:first-child, .panel > .table-bordered > tbody > tr > td:first-child,
.panel > .table-bordered > tfoot > tr > td:first-child { .panel > .table-responsive > .table-bordered > tbody > tr > td:first-child,
.panel > .table-bordered > tfoot > tr > td:first-child,
.panel > .table-responsive > .table-bordered > tfoot > tr > td:first-child {
border-left: 0; border-left: 0;
} }
.panel > .table-bordered > thead > tr > th:last-child, .panel > .table-bordered > thead > tr > th:last-child,
.panel > .table-responsive > .table-bordered > thead > tr > th:last-child,
.panel > .table-bordered > tbody > tr > th:last-child, .panel > .table-bordered > tbody > tr > th:last-child,
.panel > .table-responsive > .table-bordered > tbody > tr > th:last-child,
.panel > .table-bordered > tfoot > tr > th:last-child, .panel > .table-bordered > tfoot > tr > th:last-child,
.panel > .table-responsive > .table-bordered > tfoot > tr > th:last-child,
.panel > .table-bordered > thead > tr > td:last-child, .panel > .table-bordered > thead > tr > td:last-child,
.panel > .table-responsive > .table-bordered > thead > tr > td:last-child,
.panel > .table-bordered > tbody > tr > td:last-child, .panel > .table-bordered > tbody > tr > td:last-child,
.panel > .table-bordered > tfoot > tr > td:last-child { .panel > .table-responsive > .table-bordered > tbody > tr > td:last-child,
.panel > .table-bordered > tfoot > tr > td:last-child,
.panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child {
border-right: 0; border-right: 0;
} }
.panel > .table-bordered > thead > tr:last-child > th, .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, .panel > .table-bordered > tbody > tr:last-child > th,
.panel > .table-responsive > .table-bordered > tbody > tr:last-child > th,
.panel > .table-bordered > tfoot > tr:last-child > th, .panel > .table-bordered > tfoot > tr:last-child > th,
.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th,
.panel > .table-bordered > thead > tr:last-child > td, .panel > .table-bordered > thead > tr:last-child > td,
.panel > .table-responsive > .table-bordered > thead > tr:last-child > td,
.panel > .table-bordered > tbody > tr:last-child > td, .panel > .table-bordered > tbody > tr:last-child > td,
.panel > .table-bordered > tfoot > tr:last-child > td { .panel > .table-responsive > .table-bordered > tbody > tr:last-child > td,
.panel > .table-bordered > tfoot > tr:last-child > td,
.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td {
border-bottom: 0; border-bottom: 0;
} }
......
dist/css/bootstrap.min.css
View file @ 28e5572b
This source diff could not be displayed because it is too large. You can view the blob instead.
less/panels.less
View file @ 28e5572b
...@@ -56,13 +56,16 @@ ...@@ -56,13 +56,16 @@
// watch it go full width. // watch it go full width.
.panel { .panel {
> .table { > .table,
> .table-responsive {
margin-bottom: 0; margin-bottom: 0;
} }
> .panel-body + .table { > .panel-body + .table,
> .panel-body + .table-responsive {
border-top: 1px solid @table-border-color; border-top: 1px solid @table-border-color;
} }
> .table-bordered { > .table-bordered,
> .table-responsive > .table-bordered {
border: 0; border: 0;
> thead, > thead,
> tbody, > tbody,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment