diff options
| author | Mark Otto <[email protected]> | 2014-06-18 22:29:37 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-06-18 22:29:37 -0700 |
| commit | d4eb5552b369e42026807edf469242df4ebd78ab (patch) | |
| tree | cac3cb1c60df318e9b677f7171b30d1068984e75 /dist/css/bootstrap.css | |
| parent | 2a380f6bd8c4f96ff59de88841968fd538caf538 (diff) | |
| parent | 53d68a099d1e99499a8b473896a7035444491f36 (diff) | |
| download | bootstrap-d4eb5552b369e42026807edf469242df4ebd78ab.tar.xz bootstrap-d4eb5552b369e42026807edf469242df4ebd78ab.zip | |
Merge branch 'master' into new_striped_progress_bar_class
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index a3c5f9474..8650c3f6e 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3200,6 +3200,7 @@ tbody.collapse.in { font-size: 12px; line-height: 1.42857143; color: #777; + white-space: nowrap; } .dropdown-backdrop { position: fixed; @@ -4866,7 +4867,13 @@ a.list-group-item:focus { } .list-group-item.active .list-group-item-heading, .list-group-item.active:hover .list-group-item-heading, -.list-group-item.active:focus .list-group-item-heading { +.list-group-item.active:focus .list-group-item-heading, +.list-group-item.active .list-group-item-heading > small, +.list-group-item.active:hover .list-group-item-heading > small, +.list-group-item.active:focus .list-group-item-heading > small, +.list-group-item.active .list-group-item-heading > .small, +.list-group-item.active:hover .list-group-item-heading > .small, +.list-group-item.active:focus .list-group-item-heading > .small { color: inherit; } .list-group-item.active .list-group-item-text, |