mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-26 23:54:23 +01:00
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
This commit is contained in:
commit
9ed9fba460
@ -71,7 +71,7 @@
|
|||||||
// CSS image replacement
|
// CSS image replacement
|
||||||
// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
|
// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
|
||||||
.hide-text() {
|
.hide-text() {
|
||||||
font: 0/0 a;
|
font: ~"0/0" a;
|
||||||
color: transparent;
|
color: transparent;
|
||||||
text-shadow: none;
|
text-shadow: none;
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
|
@ -95,33 +95,31 @@ 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
|
> thead:first-child > tr:first-child > th,
|
||||||
> thead:first-child > tr:first-child > th:first-child,
|
> tbody:first-child > tr:first-child > td,
|
||||||
> tbody:first-child > tr:first-child > td:first-child,
|
> tbody:first-child > tr:first-child > th {
|
||||||
> tbody:first-child > tr:first-child > th:first-child {
|
// For first th/td in the first row in the first thead or tbody
|
||||||
border-top-left-radius: @border-radius-base;
|
&:first-child{
|
||||||
|
border-top-left-radius: @border-radius-base;
|
||||||
|
}
|
||||||
|
// For last th/td in the first row in the first thead or tbody
|
||||||
|
&:last-child{
|
||||||
|
border-top-right-radius: @border-radius-base;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// For last th/td in the first row in the first thead or tbody
|
> thead:last-child > tr:last-child > th,
|
||||||
> thead:first-child > tr:first-child > th:last-child,
|
> tbody:last-child > tr:last-child > td,
|
||||||
> tbody:first-child > tr:first-child > td:last-child,
|
> tbody:last-child > tr:last-child > th,
|
||||||
> tbody:first-child > tr:first-child > th:last-child {
|
> tfoot:last-child > tr:last-child > td,
|
||||||
border-top-right-radius: @border-radius-base;
|
> tfoot:last-child > tr:last-child > th {
|
||||||
}
|
// 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
|
&:first-child{
|
||||||
> thead:last-child > tr:last-child > th:first-child,
|
border-bottom-left-radius: @border-radius-base;
|
||||||
> tbody:last-child > tr:last-child > td:first-child,
|
}
|
||||||
> tbody:last-child > tr:last-child > th:first-child,
|
// For last th/td (can be either) in the last row in the last thead, tbody, and tfoot
|
||||||
> tfoot:last-child > tr:last-child > td:first-child,
|
&:last-child{
|
||||||
> tfoot:last-child > tr:last-child > th:first-child {
|
border-bottom-right-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
|
|
||||||
> thead:last-child > tr:last-child > th:last-child,
|
|
||||||
> tbody:last-child > tr:last-child > td: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 > th:last-child {
|
|
||||||
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
|
||||||
@ -133,19 +131,17 @@ th {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 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,
|
||||||
> caption + tbody > tr:first-child > td:first-child,
|
> caption + tbody > tr:first-child > td,
|
||||||
> colgroup + thead > tr:first-child > th:first-child,
|
> colgroup + thead > tr:first-child > th,
|
||||||
> colgroup + tbody > tr:first-child > td:first-child {
|
> colgroup + tbody > tr:first-child > td {
|
||||||
border-top-left-radius: @border-radius-base;
|
&:first-child{
|
||||||
|
border-top-left-radius: @border-radius-base;
|
||||||
|
}
|
||||||
|
&:last-child{
|
||||||
|
border-top-right-radius: @border-radius-base;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
> caption + thead > tr:first-child > th:last-child,
|
|
||||||
> caption + tbody > tr:first-child > td:last-child,
|
|
||||||
> colgroup + thead > tr:first-child > th:last-child,
|
|
||||||
> colgroup + tbody > tr:first-child > td:last-child {
|
|
||||||
border-top-right-radius: @border-radius-base;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user