diff options
| author | Mark Otto <[email protected]> | 2014-03-06 21:44:46 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-06 21:44:46 -0800 |
| commit | df3eb66ede02646c3ddc15b796d189f5effc60bb (patch) | |
| tree | a2705394355a4d1244e2dd9f7e8723e680477f6f /dist/css/bootstrap.css | |
| parent | 4868096dbdfbf9f82e08cf2906fd2ce19f8f1560 (diff) | |
| parent | 0c9308a3b29be6d56c582dce33092164be7997b4 (diff) | |
| download | bootstrap-df3eb66ede02646c3ddc15b796d189f5effc60bb.tar.xz bootstrap-df3eb66ede02646c3ddc15b796d189f5effc60bb.zip | |
Merge branch 'master' into popovers-use-radii-var
Conflicts:
dist/css/bootstrap.css.map
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap.css.map
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index d70cf4ede..271b87458 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2199,7 +2199,7 @@ table th[class*="col-"] { .table-hover > tbody > tr.danger:hover > th { background-color: #ebcccc; } -@media (max-width: 767px) { +@media screen and (max-width: 767px) { .table-responsive { width: 100%; margin-bottom: 15px; @@ -4694,6 +4694,22 @@ a.list-group-item:focus { text-decoration: none; background-color: #f5f5f5; } +.list-group-item.disabled, +.list-group-item.disabled:hover, +.list-group-item.disabled:focus { + color: #999; + background-color: #eee; +} +.list-group-item.disabled .list-group-item-heading, +.list-group-item.disabled:hover .list-group-item-heading, +.list-group-item.disabled:focus .list-group-item-heading { + color: inherit; +} +.list-group-item.disabled .list-group-item-text, +.list-group-item.disabled:hover .list-group-item-text, +.list-group-item.disabled:focus .list-group-item-text { + color: #999; +} .list-group-item.active, .list-group-item.active:hover, .list-group-item.active:focus { |