Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <otto@github.com>2012-12-09 00:57:21 +0400
committerMark Otto <otto@github.com>2012-12-09 00:57:21 +0400
commit9376a7c221a64c2bf508d02ea2ccd85748d10fcc (patch)
tree22108fb29cdb08456ad1a00451b742d84a699a3c
parentcacc2137620675f81ab8895c2988778d12f92596 (diff)
Fixes #5729: Nested striped tablesv2.2.2
* Scopes striping to immediate children of the tbody and tr * For nested tables, sets a background color of @bodyBackground, to override the default transparent bg
-rw-r--r--docs/assets/css/bootstrap.css8
-rw-r--r--less/tables.less9
2 files changed, 13 insertions, 4 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index c0838edc5c..8ab3cefcf7 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2012,6 +2012,10 @@ table {
border-top: 2px solid #dddddd;
}
+.table .table {
+ background-color: #ffffff;
+}
+
.table-condensed th,
.table-condensed td {
padding: 4px 5px;
@@ -2104,8 +2108,8 @@ table {
-moz-border-radius-topright: 4px;
}
-.table-striped tbody tr:nth-child(odd) td,
-.table-striped tbody tr:nth-child(odd) th {
+.table-striped tbody > tr:nth-child(odd) > td,
+.table-striped tbody > tr:nth-child(odd) > th {
background-color: #f9f9f9;
}
diff --git a/less/tables.less b/less/tables.less
index b816e7c2d2..f3b9967f07 100644
--- a/less/tables.less
+++ b/less/tables.less
@@ -48,6 +48,11 @@ table {
tbody + tbody {
border-top: 2px solid @tableBorder;
}
+
+ // Nesting
+ .table {
+ background-color: @bodyBackground;
+ }
}
@@ -143,8 +148,8 @@ table {
// Default zebra-stripe styles (alternating gray and transparent backgrounds)
.table-striped {
tbody {
- tr:nth-child(odd) td,
- tr:nth-child(odd) th {
+ > tr:nth-child(odd) > td,
+ > tr:nth-child(odd) > th {
background-color: @tableBackgroundAccent;
}
}