rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-03-15 15:29:22 +01:00
Code Issues Actions Packages Releases Activity

fixes #4304: more specific selectors on table border classes to override .table-striped

Browse Source
This commit is contained in:
Mark Otto 2012-08-07 22:50:49 -07:00
parent a525a6fe33
commit 4eee78e051
2 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
docs/assets/css/bootstrap.css vendored
View File

@ -1774,18 +1774,6 @@ table {
border-top: 2px solid #dddddd; 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 th,
.table-condensed td { .table-condensed td {
padding: 4px 5px; padding: 4px 5px;
@ -1874,8 +1862,8 @@ table {
background-color: #f9f9f9; background-color: #f9f9f9;
} }
.table-hover tbody tr:hover td, .table-hover tr:hover td,
.table-hover tbody tr:hover th { .table-hover tr:hover th {
background-color: #f5f5f5; background-color: #f5f5f5;
} }
@ -2030,6 +2018,18 @@ table .span24 {
margin-left: 0; 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-"],
[class*=" icon-"] { [class*=" icon-"] {
display: inline-block; display: inline-block;

31
less/tables.less
View File

@ -48,16 +48,6 @@ table {
tbody + tbody { tbody + tbody {
border-top: 2px solid @tableBorder; 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 // Placed here since it has to come after the potential zebra striping
.table-hover { .table-hover {
tbody tr:hover td, tr:hover td,
tbody tr:hover th { tr:hover th {
background-color: @tableBackgroundHover; background-color: @tableBackgroundHover;
} }
} }
@ -214,3 +204,20 @@ table {
.span23 { .tableColumns(23); } .span23 { .tableColumns(23); }
.span24 { .tableColumns(24); } .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;
}
}