aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-08-07 22:50:49 -0700
committerMark Otto <[email protected]>2012-08-07 22:50:49 -0700
commit4eee78e0513c2c08b26fb57c43d57b9cb0857a87 (patch)
tree5dc055852593f5673023e8e0c4e57ca3f3c840e9
parenta525a6fe33afde7d4ab4a0febaaed76ff0393505 (diff)
downloadbootstrap-4eee78e0513c2c08b26fb57c43d57b9cb0857a87.tar.xz
bootstrap-4eee78e0513c2c08b26fb57c43d57b9cb0857a87.zip
fixes #4304: more specific selectors on table border classes to override .table-striped
-rw-r--r--docs/assets/css/bootstrap.css28
-rw-r--r--less/tables.less31
2 files changed, 33 insertions, 26 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 6bb9e1545..b2e903cc9 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1774,18 +1774,6 @@ table {
border-top: 2px solid #dddddd;
}
-.table .success td {
- background-color: #dff0d8;
-}
-
-.table .error td {
- background-color: #f2dede;
-}
-
-.table .info td {
- background-color: #d9edf7;
-}
-
.table-condensed th,
.table-condensed td {
padding: 4px 5px;
@@ -1874,8 +1862,8 @@ table {
background-color: #f9f9f9;
}
-.table-hover tbody tr:hover td,
-.table-hover tbody tr:hover th {
+.table-hover tr:hover td,
+.table-hover tr:hover th {
background-color: #f5f5f5;
}
@@ -2030,6 +2018,18 @@ table .span24 {
margin-left: 0;
}
+.table tbody .success td {
+ background-color: #dff0d8;
+}
+
+.table tbody .error td {
+ background-color: #f2dede;
+}
+
+.table tbody .info td {
+ background-color: #d9edf7;
+}
+
[class^="icon-"],
[class*=" icon-"] {
display: inline-block;
diff --git a/less/tables.less b/less/tables.less
index 90168c569..3d571fe54 100644
--- a/less/tables.less
+++ b/less/tables.less
@@ -48,16 +48,6 @@ table {
tbody + tbody {
border-top: 2px solid @tableBorder;
}
-
- .success td {
- background-color: @successBackground;
- }
- .error td {
- background-color: @errorBackground;
- }
- .info td {
- background-color: @infoBackground;
- }
}
@@ -169,8 +159,8 @@ table {
// ------------
// Placed here since it has to come after the potential zebra striping
.table-hover {
- tbody tr:hover td,
- tbody tr:hover th {
+ tr:hover td,
+ tr:hover th {
background-color: @tableBackgroundHover;
}
}
@@ -214,3 +204,20 @@ table {
.span23 { .tableColumns(23); }
.span24 { .tableColumns(24); }
}
+
+
+// TABLE BACKGROUNDS
+// -----------------
+// Exact selectors below required to override .table-striped
+
+.table {
+ tbody tr.success td {
+ background-color: @successBackground;
+ }
+ tbody tr.error td {
+ background-color: @errorBackground;
+ }
+ tbody tr.info td {
+ background-color: @infoBackground;
+ }
+}