rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-11 08:54:23 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #15052 from twbs/badge-in-non-anchor-list-group-item

Browse Source 
Badges: fix active styles when in non-anchor `.list-group-item`
This commit is contained in:
Mark Otto 2014-11-09 15:05:40 -08:00
commit 99148166c5
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
less/badges.less
View File

@ -44,11 +44,17 @@
} }
// Account for badges in navs // Account for badges in navs
a.list-group-item.active > &, .list-group-item.active > &,
.nav-pills > .active > a > & { .nav-pills > .active > a > & {
color: @badge-active-color; color: @badge-active-color;
background-color: @badge-active-bg; background-color: @badge-active-bg;
} }
.list-group-item > & {
float: right;
}
.list-group-item > & + & {
margin-right: 5px;
}
.nav-pills > li > a > & { .nav-pills > li > a > & {
margin-left: 3px; margin-left: 3px;
} }

8
less/list-group.less
View File

@ -35,14 +35,6 @@
margin-bottom: 0; margin-bottom: 0;
.border-bottom-radius(@list-group-border-radius); .border-bottom-radius(@list-group-border-radius);
} }
// Align badges within list items
> .badge {
float: right;
}
> .badge + .badge {
margin-right: 5px;
}
} }