aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2013-07-23 22:59:33 -0700
committerJacob Thornton <[email protected]>2013-07-23 22:59:33 -0700
commit3cfa1c8a30beb081167105b7ea006e9089e566f5 (patch)
tree9a15de39e176d18912ad198151f67572273e11f5 /less
parent6841c5096888b9a1f8b4b9453adac23cee3788d9 (diff)
parent1d1bd62598f309eeffb9fa4e277e02b633520a7f (diff)
downloadbootstrap-3cfa1c8a30beb081167105b7ea006e9089e566f5.tar.xz
bootstrap-3cfa1c8a30beb081167105b7ea006e9089e566f5.zip
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts: dist/js/bootstrap.min.js
Diffstat (limited to 'less')
-rw-r--r--less/tables.less10
1 files changed, 7 insertions, 3 deletions
diff --git a/less/tables.less b/less/tables.less
index c75e9100e..5f1c4dbf4 100644
--- a/less/tables.less
+++ b/less/tables.less
@@ -152,9 +152,12 @@ table {
// Table backgrounds
// -----------------
-// Exact selectors below required to override .table-striped
+// Exact selectors below required to override `.table-striped` and prevent
+// inheritance to nested tables.
-.table > tbody > tr {
+.table > thead > tr,
+.table > tbody > tr,
+.table > tfoot > tr {
> td.active,
> th.active,
&.active > td {
@@ -180,7 +183,8 @@ table {
}
}
-// Hover states for .table-hover
+// Hover states for `.table-hover`
+// Note: this is not available for cells or rows within `thead` or `tfoot`.
.table-hover > tbody > tr {
> td.success:hover,
> th.success:hover,