aboutsummaryrefslogtreecommitdiff
path: root/less/badges.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-11-11 19:25:16 -0800
committerMark Otto <[email protected]>2014-11-11 19:25:16 -0800
commit1e268ddfc30def5f4b2b0f2ace34b7de549ea830 (patch)
tree7cc63bc43a6c3b603cef4f004a2285e5c034a710 /less/badges.less
parent4f6aeaa6347725436296131c4d2b059243390a04 (diff)
parent001d5e00c58bbb8e4d34c085c5b27b214a475bd5 (diff)
downloadbootstrap-1e268ddfc30def5f4b2b0f2ace34b7de549ea830.tar.xz
bootstrap-1e268ddfc30def5f4b2b0f2ace34b7de549ea830.zip
Merge branch 'master' into labels-readme
Diffstat (limited to 'less/badges.less')
-rw-r--r--less/badges.less8
1 files changed, 7 insertions, 1 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;
}