Skip to content

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

Scope .table-bordered styles to immediate children only

parent 9d9fd5e0
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 78 deletions
docs/assets/css/bootstrap.css
View file @ e1d947f5
...@@ -1073,72 +1073,72 @@ th { ...@@ -1073,72 +1073,72 @@ th {
border-radius: 4px; border-radius: 4px;
} }
.table-bordered thead > tr > th, .table-bordered > thead > tr > th,
.table-bordered tbody > tr > th, .table-bordered > tbody > tr > th,
.table-bordered thead > tr > td, .table-bordered > thead > tr > td,
.table-bordered tbody > tr > td { .table-bordered > tbody > tr > td {
border-left: 1px solid #dddddd; border-left: 1px solid #dddddd;
} }
.table-bordered caption + thead > tr:first-child th, .table-bordered > caption + thead > tr:first-child th,
.table-bordered caption + tbody > tr:first-child th, .table-bordered > caption + tbody > tr:first-child th,
.table-bordered caption + tbody > tr:first-child td, .table-bordered > caption + tbody > tr:first-child td,
.table-bordered colgroup + thead > tr:first-child th, .table-bordered > colgroup + thead > tr:first-child th,
.table-bordered colgroup + tbody > tr:first-child th, .table-bordered > colgroup + tbody > tr:first-child th,
.table-bordered colgroup + tbody > tr:first-child td, .table-bordered > colgroup + tbody > tr:first-child td,
.table-bordered thead:first-child > tr:first-child th, .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 th,
.table-bordered tbody:first-child > tr:first-child td { .table-bordered > tbody:first-child > tr:first-child td {
border-top: 0; border-top: 0;
} }
.table-bordered thead:first-child > tr:first-child > th:first-child, .table-bordered > thead:first-child > tr:first-child > th:first-child,
.table-bordered tbody:first-child > tr:first-child > td:first-child, .table-bordered > tbody:first-child > tr:first-child > td:first-child,
.table-bordered tbody:first-child > tr:first-child > th:first-child { .table-bordered > tbody:first-child > tr:first-child > th:first-child {
border-top-left-radius: 4px; border-top-left-radius: 4px;
} }
.table-bordered thead:first-child > tr:first-child > th:last-child, .table-bordered > thead:first-child > tr:first-child > th:last-child,
.table-bordered tbody:first-child > tr:first-child > td:last-child, .table-bordered > tbody:first-child > tr:first-child > td:last-child,
.table-bordered tbody:first-child > tr:first-child > th:last-child { .table-bordered > tbody:first-child > tr:first-child > th:last-child {
border-top-right-radius: 4px; border-top-right-radius: 4px;
} }
.table-bordered thead:last-child > tr:last-child > th:first-child, .table-bordered > thead:last-child > tr:last-child > th:first-child,
.table-bordered tbody:last-child > tr:last-child > td:first-child, .table-bordered > tbody:last-child > tr:last-child > td:first-child,
.table-bordered tbody:last-child > tr:last-child > th:first-child, .table-bordered > tbody:last-child > tr:last-child > th:first-child,
.table-bordered tfoot:last-child > tr:last-child > td:first-child, .table-bordered > tfoot:last-child > tr:last-child > td:first-child,
.table-bordered tfoot:last-child > tr:last-child > th:first-child { .table-bordered > tfoot:last-child > tr:last-child > th:first-child {
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
} }
.table-bordered thead:last-child > tr:last-child > th:last-child, .table-bordered > thead:last-child > tr:last-child > th:last-child,
.table-bordered tbody:last-child > tr:last-child > td:last-child, .table-bordered > tbody:last-child > tr:last-child > td:last-child,
.table-bordered tbody:last-child > tr:last-child > th:last-child, .table-bordered > tbody:last-child > tr:last-child > th:last-child,
.table-bordered tfoot:last-child > tr:last-child > td:last-child, .table-bordered > tfoot:last-child > tr:last-child > td:last-child,
.table-bordered tfoot:last-child > tr:last-child > th:last-child { .table-bordered > tfoot:last-child > tr:last-child > th:last-child {
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
} }
.table-bordered tfoot + tbody:last-child > tr:last-child > td:first-child { .table-bordered > tfoot + tbody:last-child > tr:last-child > td:first-child {
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
.table-bordered tfoot + tbody:last-child > tr:last-child > td:last-child { .table-bordered > tfoot + tbody:last-child > tr:last-child > td:last-child {
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
} }
.table-bordered caption + thead > tr:first-child > th:first-child, .table-bordered > caption + thead > tr:first-child > th:first-child,
.table-bordered caption + tbody > tr:first-child > td:first-child, .table-bordered > caption + tbody > tr:first-child > td:first-child,
.table-bordered colgroup + thead > tr:first-child > th:first-child, .table-bordered > colgroup + thead > tr:first-child > th:first-child,
.table-bordered colgroup + tbody > tr:first-child > td:first-child { .table-bordered > colgroup + tbody > tr:first-child > td:first-child {
border-top-left-radius: 4px; border-top-left-radius: 4px;
} }
.table-bordered caption + thead > tr:first-child > th:last-child, .table-bordered > caption + thead > tr:first-child > th:last-child,
.table-bordered caption + tbody > tr:first-child > td:last-child, .table-bordered > caption + tbody > tr:first-child > td:last-child,
.table-bordered colgroup + thead > tr:first-child > th:last-child, .table-bordered > colgroup + thead > tr:first-child > th:last-child,
.table-bordered colgroup + tbody > tr:first-child > td:last-child { .table-bordered > colgroup + tbody > tr:first-child > td:last-child {
border-top-right-radius: 4px; border-top-right-radius: 4px;
} }
......
less/tables.less
View file @ e1d947f5
...@@ -76,72 +76,73 @@ th { ...@@ -76,72 +76,73 @@ th {
border-collapse: separate; // Done so we can round those corners! border-collapse: separate; // Done so we can round those corners!
border-left: 0; border-left: 0;
border-radius: @border-radius-base; border-radius: @border-radius-base;
thead > tr > th,
tbody > tr > th, > thead > tr > th,
thead > tr > td, > tbody > tr > th,
tbody > tr > td { > thead > tr > td,
> tbody > tr > td {
border-left: 1px solid @table-border-color; border-left: 1px solid @table-border-color;
} }
// Prevent a double border // Prevent a double border
caption + thead > tr:first-child th, > caption + thead > tr:first-child th,
caption + tbody > tr:first-child th, > caption + tbody > tr:first-child th,
caption + tbody > tr:first-child td, > caption + tbody > tr:first-child td,
colgroup + thead > tr:first-child th, > colgroup + thead > tr:first-child th,
colgroup + tbody > tr:first-child th, > colgroup + tbody > tr:first-child th,
colgroup + tbody > tr:first-child td, > colgroup + tbody > tr:first-child td,
thead:first-child > tr:first-child th, > thead:first-child > tr:first-child th,
tbody:first-child > tr:first-child th, > tbody:first-child > tr:first-child th,
tbody:first-child > tr:first-child td { > tbody:first-child > tr:first-child td {
border-top: 0; border-top: 0;
} }
// For first th/td in the first row in the first thead or tbody // For first th/td in the first row in the first thead or tbody
thead:first-child > tr:first-child > th:first-child, > thead:first-child > tr:first-child > th:first-child,
tbody:first-child > tr:first-child > td:first-child, > tbody:first-child > tr:first-child > td:first-child,
tbody:first-child > tr:first-child > th:first-child { > tbody:first-child > tr:first-child > th:first-child {
border-top-left-radius: @border-radius-base; border-top-left-radius: @border-radius-base;
} }
// For last th/td in the first row in the first thead or tbody // For last th/td in the first row in the first thead or tbody
thead:first-child > tr:first-child > th:last-child, > thead:first-child > tr:first-child > th:last-child,
tbody:first-child > tr:first-child > td:last-child, > tbody:first-child > tr:first-child > td:last-child,
tbody:first-child > tr:first-child > th:last-child { > tbody:first-child > tr:first-child > th:last-child {
border-top-right-radius: @border-radius-base; border-top-right-radius: @border-radius-base;
} }
// For first th/td (can be either) in the last row in the last thead, tbody, and tfoot // For first th/td (can be either) in the last row in the last thead, tbody, and tfoot
thead:last-child > tr:last-child > th:first-child, > thead:last-child > tr:last-child > th:first-child,
tbody:last-child > tr:last-child > td:first-child, > tbody:last-child > tr:last-child > td:first-child,
tbody:last-child > tr:last-child > th:first-child, > tbody:last-child > tr:last-child > th:first-child,
tfoot:last-child > tr:last-child > td:first-child, > tfoot:last-child > tr:last-child > td:first-child,
tfoot:last-child > tr:last-child > th:first-child { > tfoot:last-child > tr:last-child > th:first-child {
border-bottom-left-radius: @border-radius-base; border-bottom-left-radius: @border-radius-base;
} }
// For last th/td (can be either) in the last row in the last thead, tbody, and tfoot // For last th/td (can be either) in the last row in the last thead, tbody, and tfoot
thead:last-child > tr:last-child > th:last-child, > thead:last-child > tr:last-child > th:last-child,
tbody:last-child > tr:last-child > td:last-child, > tbody:last-child > tr:last-child > td:last-child,
tbody:last-child > tr:last-child > th:last-child, > tbody:last-child > tr:last-child > th:last-child,
tfoot:last-child > tr:last-child > td:last-child, > tfoot:last-child > tr:last-child > td:last-child,
tfoot:last-child > tr:last-child > th:last-child { > tfoot:last-child > tr:last-child > th:last-child {
border-bottom-right-radius: @border-radius-base; border-bottom-right-radius: @border-radius-base;
} }
// Clear border-radius for first and last td in the last row in the last tbody for table with tfoot // Clear border-radius for first and last td in the last row in the last tbody for table with tfoot
tfoot + tbody:last-child > tr:last-child > td:first-child { > tfoot + tbody:last-child > tr:last-child > td:first-child {
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
tfoot + tbody:last-child > tr:last-child > td:last-child { > tfoot + tbody:last-child > tr:last-child > td:last-child {
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
} }
// Special fixes to round the left border on the first td/th // Special fixes to round the left border on the first td/th
caption + thead > tr:first-child > th:first-child, > caption + thead > tr:first-child > th:first-child,
caption + tbody > tr:first-child > td:first-child, > caption + tbody > tr:first-child > td:first-child,
colgroup + thead > tr:first-child > th:first-child, > colgroup + thead > tr:first-child > th:first-child,
colgroup + tbody > tr:first-child > td:first-child { > colgroup + tbody > tr:first-child > td:first-child {
border-top-left-radius: @border-radius-base; border-top-left-radius: @border-radius-base;
} }
caption + thead > tr:first-child > th:last-child, > caption + thead > tr:first-child > th:last-child,
caption + tbody > tr:first-child > td:last-child, > caption + tbody > tr:first-child > td:last-child,
colgroup + thead > tr:first-child > th:last-child, > colgroup + thead > tr:first-child > th:last-child,
colgroup + tbody > tr:first-child > td:last-child { > colgroup + tbody > tr:first-child > td:last-child {
border-top-right-radius: @border-radius-base; border-top-right-radius: @border-radius-base;
} }
......
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