diff options
| author | Mark Otto <[email protected]> | 2013-08-14 15:19:57 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-14 15:19:57 -0700 |
| commit | 48bcf8164617772f7b14df298a045a409720f057 (patch) | |
| tree | eaab63c2b0d0e253c3ef86da10695d9c7af2af3d /dist/css/bootstrap.css | |
| parent | 2002045b7f3acc0cacf1454d31f5bfc5d7e8968f (diff) | |
| parent | 09e1f69d3e5c7b2f8d68e757701d48811c1a0b65 (diff) | |
| download | bootstrap-48bcf8164617772f7b14df298a045a409720f057.tar.xz bootstrap-48bcf8164617772f7b14df298a045a409720f057.zip | |
Merge branch '3.0.0-wip' of https://github.com/jharbert/bootstrap into jharbert-3.0.0-wip
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index b001fec44..2c7c5bbc6 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1481,6 +1481,13 @@ table th[class^="col-"] { border-color: #d6e9c6; } +.table-hover > tbody > tr > td.success:hover, +.table-hover > tbody > tr > th.success:hover, +.table-hover > tbody > tr.success:hover > td { + background-color: #d0e9c6; + border-color: #c9e2b3; +} + .table > thead > tr > td.danger, .table > tbody > tr > td.danger, .table > tfoot > tr > td.danger, @@ -1497,6 +1504,13 @@ table th[class^="col-"] { border-color: #eed3d7; } +.table-hover > tbody > tr > td.danger:hover, +.table-hover > tbody > tr > th.danger:hover, +.table-hover > tbody > tr.danger:hover > td { + background-color: #ebcccc; + border-color: #e6c1c7; +} + .table > thead > tr > td.warning, .table > tbody > tr > td.warning, .table > tfoot > tr > td.warning, @@ -1513,20 +1527,6 @@ table th[class^="col-"] { border-color: #fbeed5; } -.table-hover > tbody > tr > td.success:hover, -.table-hover > tbody > tr > th.success:hover, -.table-hover > tbody > tr.success:hover > td { - background-color: #d0e9c6; - border-color: #c9e2b3; -} - -.table-hover > tbody > tr > td.danger:hover, -.table-hover > tbody > tr > th.danger:hover, -.table-hover > tbody > tr.danger:hover > td { - background-color: #ebcccc; - border-color: #e6c1c7; -} - .table-hover > tbody > tr > td.warning:hover, .table-hover > tbody > tr > th.warning:hover, .table-hover > tbody > tr.warning:hover > td { |