github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-04-24 03:00:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2.2-wip' into exploratory

Browse Source
This commit is contained in:
Mark Otto
2012-11-15 09:15:37 -08:00
parent 1a4ce9ba18 05655ff4ff
commit a43bf14ea5
6 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
less/navbar.less
View File

@@ -368,6 +368,10 @@
}
}
.brand {
color: @navbarInverseBrandColor;
}
.navbar-text {
color: @navbarInverseText;
}

23
less/tables.less
View File

@@ -90,36 +90,45 @@ table {
// For first th or td in the first row in the first thead or tbody
thead:first-child tr:first-child th:first-child,
tbody:first-child tr:first-child td:first-child {
.border-top-left-radius(4px);
.border-top-left-radius(@baseBorderRadius);
}
thead:first-child tr:first-child th:last-child,
tbody:first-child tr:first-child td:last-child {
.border-top-right-radius(4px);
.border-top-right-radius(@baseBorderRadius);
}
// For first th or td in the first row in the first thead or tbody
// For first th or td in the last row in the last thead or tbody
thead:last-child tr:last-child th:first-child,
tbody:last-child tr:last-child td:first-child,
tfoot:last-child tr:last-child td:first-child {
.border-bottom-left-radius(4px);
.border-bottom-left-radius(@baseBorderRadius);
}
thead:last-child tr:last-child th:last-child,
tbody:last-child tr:last-child td:last-child,
tfoot:last-child tr:last-child td:last-child {
.border-bottom-right-radius(4px);
.border-bottom-right-radius(@baseBorderRadius);
}
// 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 {
.border-bottom-left-radius(0);
}
tfoot + tbody:last-child tr:last-child td:last-child {
.border-bottom-right-radius(0);
}
// Special fixes to round the left border on the first td/th
caption + thead tr:first-child th:first-child,
caption + tbody tr:first-child td:first-child,
colgroup + thead tr:first-child th:first-child,
colgroup + tbody tr:first-child td:first-child {
.border-top-left-radius(4px);
.border-top-left-radius(@baseBorderRadius);
}
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(4px);
.border-top-right-radius(@baseBorderRadius);
}
}