diff options
| author | Mark Otto <[email protected]> | 2014-11-09 15:05:40 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-11-09 15:05:40 -0800 |
| commit | 99148166c5cb4017227c649849c8fe51bb8d7473 (patch) | |
| tree | c1854914309e896166bcd9cf6b927c78ec2e5156 | |
| parent | 5670dd8930228af772157b933fe672ca5c5313ca (diff) | |
| parent | a05f07528a7081ad3ce520831ba851a81b903d8e (diff) | |
| download | bootstrap-99148166c5cb4017227c649849c8fe51bb8d7473.tar.xz bootstrap-99148166c5cb4017227c649849c8fe51bb8d7473.zip | |
Merge pull request #15052 from twbs/badge-in-non-anchor-list-group-item
Badges: fix active styles when in non-anchor `.list-group-item`
| -rw-r--r-- | less/badges.less | 8 | ||||
| -rw-r--r-- | less/list-group.less | 8 |
2 files changed, 7 insertions, 9 deletions
diff --git a/less/badges.less b/less/badges.less index 20624f30d..b27c405a3 100644 --- a/less/badges.less +++ b/less/badges.less @@ -44,11 +44,17 @@ } // Account for badges in navs - a.list-group-item.active > &, + .list-group-item.active > &, .nav-pills > .active > a > & { color: @badge-active-color; background-color: @badge-active-bg; } + .list-group-item > & { + float: right; + } + .list-group-item > & + & { + margin-right: 5px; + } .nav-pills > li > a > & { margin-left: 3px; } diff --git a/less/list-group.less b/less/list-group.less index da657005e..1462ce16b 100644 --- a/less/list-group.less +++ b/less/list-group.less @@ -35,14 +35,6 @@ margin-bottom: 0; .border-bottom-radius(@list-group-border-radius); } - - // Align badges within list items - > .badge { - float: right; - } - > .badge + .badge { - margin-right: 5px; - } } |