rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity

Simplify table state styles

Browse Source
This commit is contained in:
Zlatan Vasović 2013-11-07 09:53:33 +01:00
parent 463343af63
commit 96109d3138
4 changed files with 70 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
dist/css/bootstrap.css vendored
View File

@ -1716,84 +1716,75 @@ table th[class*="col-"] {
float: none; float: none;
} }
.table > thead > tr > td.active, .table > thead > tr > .active,
.table > tbody > tr > td.active, .table > tbody > tr > .active,
.table > tfoot > tr > td.active, .table > tfoot > tr > .active,
.table > thead > tr > th.active, .table > thead > .active > td,
.table > tbody > tr > th.active, .table > tbody > .active > td,
.table > tfoot > tr > th.active, .table > tfoot > .active > td,
.table > thead > tr.active > td, .table > thead > .active > th,
.table > tbody > tr.active > td, .table > tbody > .active > th,
.table > tfoot > tr.active > td, .table > tfoot > .active > th {
.table > thead > tr.active > th,
.table > tbody > tr.active > th,
.table > tfoot > tr.active > th {
background-color: #f5f5f5; background-color: #f5f5f5;
} }
.table > thead > tr > td.success, .table-hover > tbody > tr > .active:hover,
.table > tbody > tr > td.success, .table-hover > tbody > .active:hover > td,
.table > tfoot > tr > td.success, .table-hover > tbody > .active:hover > th {
.table > thead > tr > th.success, background-color: #e8e8e8;
.table > tbody > tr > th.success, }
.table > tfoot > tr > th.success,
.table > thead > tr.success > td, .table > thead > tr > .success,
.table > tbody > tr.success > td, .table > tbody > tr > .success,
.table > tfoot > tr.success > td, .table > tfoot > tr > .success,
.table > thead > tr.success > th, .table > thead > .success > td,
.table > tbody > tr.success > th, .table > tbody > .success > td,
.table > tfoot > tr.success > th { .table > tfoot > .success > td,
.table > thead > .success > th,
.table > tbody > .success > th,
.table > tfoot > .success > th {
background-color: #dff0d8; background-color: #dff0d8;
} }
.table-hover > tbody > tr > td.success:hover, .table-hover > tbody > tr > .success:hover,
.table-hover > tbody > tr > th.success:hover, .table-hover > tbody > .success:hover > td,
.table-hover > tbody > tr.success:hover > td, .table-hover > tbody > .success:hover > th {
.table-hover > tbody > tr.success:hover > th {
background-color: #d0e9c6; background-color: #d0e9c6;
} }
.table > thead > tr > td.danger, .table > thead > tr > .danger,
.table > tbody > tr > td.danger, .table > tbody > tr > .danger,
.table > tfoot > tr > td.danger, .table > tfoot > tr > .danger,
.table > thead > tr > th.danger, .table > thead > .danger > td,
.table > tbody > tr > th.danger, .table > tbody > .danger > td,
.table > tfoot > tr > th.danger, .table > tfoot > .danger > td,
.table > thead > tr.danger > td, .table > thead > .danger > th,
.table > tbody > tr.danger > td, .table > tbody > .danger > th,
.table > tfoot > tr.danger > td, .table > tfoot > .danger > th {
.table > thead > tr.danger > th,
.table > tbody > tr.danger > th,
.table > tfoot > tr.danger > th {
background-color: #f2dede; background-color: #f2dede;
} }
.table-hover > tbody > tr > td.danger:hover, .table-hover > tbody > tr > .danger:hover,
.table-hover > tbody > tr > th.danger:hover, .table-hover > tbody > .danger:hover > td,
.table-hover > tbody > tr.danger:hover > td, .table-hover > tbody > .danger:hover > th {
.table-hover > tbody > tr.danger:hover > th {
background-color: #ebcccc; background-color: #ebcccc;
} }
.table > thead > tr > td.warning, .table > thead > tr > .warning,
.table > tbody > tr > td.warning, .table > tbody > tr > .warning,
.table > tfoot > tr > td.warning, .table > tfoot > tr > .warning,
.table > thead > tr > th.warning, .table > thead > .warning > td,
.table > tbody > tr > th.warning, .table > tbody > .warning > td,
.table > tfoot > tr > th.warning, .table > tfoot > .warning > td,
.table > thead > tr.warning > td, .table > thead > .warning > th,
.table > tbody > tr.warning > td, .table > tbody > .warning > th,
.table > tfoot > tr.warning > td, .table > tfoot > .warning > th {
.table > thead > tr.warning > th,
.table > tbody > tr.warning > th,
.table > tfoot > tr.warning > th {
background-color: #fcf8e3; background-color: #fcf8e3;
} }
.table-hover > tbody > tr > td.warning:hover, .table-hover > tbody > tr > .warning:hover,
.table-hover > tbody > tr > th.warning:hover, .table-hover > tbody > .warning:hover > td,
.table-hover > tbody > tr.warning:hover > td, .table-hover > tbody > .warning:hover > th {
.table-hover > tbody > tr.warning:hover > th {
background-color: #faf2cc; background-color: #faf2cc;
} }

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

28
less/mixins.less
View File

@ -430,27 +430,27 @@
// Tables // Tables
// ------------------------- // -------------------------
.table-row-variant(@state; @background; @border) { .table-row-variant(@state; @background) {
// Exact selectors below required to override `.table-striped` and prevent // Exact selectors below required to override `.table-striped` and prevent
// inheritance to nested tables. // inheritance to nested tables.
.table > thead > tr, .table {
.table > tbody > tr, > thead,
.table > tfoot > tr { > tbody,
> td.@{state}, > tfoot {
> th.@{state}, > tr > .@{state},
&.@{state} > td, > .@{state} > td,
&.@{state} > th { > .@{state} > th {
background-color: @background; background-color: @background;
}
} }
} }
// Hover states for `.table-hover` // Hover states for `.table-hover`
// Note: this is not available for cells or rows within `thead` or `tfoot`. // Note: this is not available for cells or rows within `thead` or `tfoot`.
.table-hover > tbody > tr { .table-hover > tbody {
> td.@{state}:hover, > tr > .@{state}:hover,
> th.@{state}:hover, > .@{state}:hover > td,
&.@{state}:hover > td, > .@{state}:hover > th {
&.@{state}:hover > th {
background-color: darken(@background, 5%); background-color: darken(@background, 5%);
} }
} }

22
less/tables.less
View File

@ -152,25 +152,11 @@ table {
// Exact selectors below required to override `.table-striped` and prevent // Exact selectors below required to override `.table-striped` and prevent
// inheritance to nested tables. // inheritance to nested tables.
.table {
> thead,
> tbody,
> tfoot {
> tr {
> td.active,
> th.active,
&.active > td,
&.active > th {
background-color: @table-bg-active;
}
}
}
}
// Generate the contextual variants // Generate the contextual variants
.table-row-variant(success; @state-success-bg; @state-success-border); .table-row-variant(active; @table-bg-active);
.table-row-variant(danger; @state-danger-bg; @state-danger-border); .table-row-variant(success; @state-success-bg);
.table-row-variant(warning; @state-warning-bg; @state-warning-border); .table-row-variant(danger; @state-danger-bg);
.table-row-variant(warning; @state-warning-bg);
// Responsive tables // Responsive tables