diff options
| author |   Agustin Henze <tin@sluc.org.ar> | 2015-07-08 07:35:06 -0300 |
|---|---|---|
| committer | Agustin Henze <tin@sluc.org.ar> | 2015-07-08 07:35:06 -0300 |
| commit | 055d72d76b44b0e627c8a17c48dbecd62e44197b (patch) | |
| tree | e2c8d5475477c46115461fe9547c1ee797873635 /bower_components/bootstrap/less/badges.less | |
| parent | 61f3aad02cd6492cb38e41b66f2ed8ec56e98981 (diff) | |
| parent | b0b24795b24ee6809397fbbadf42f31f310a219f (diff) | |
Merge tag 'upstream/7.6.0'
Upstream version 7.6.0
Diffstat (limited to 'bower_components/bootstrap/less/badges.less')
| -rw-r--r-- | bower_components/bootstrap/less/badges.less | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/bower_components/bootstrap/less/badges.less b/bower_components/bootstrap/less/badges.less index 20624f3..6ee16dc 100644 --- a/bower_components/bootstrap/less/badges.less +++ b/bower_components/bootstrap/less/badges.less @@ -12,7 +12,7 @@ font-weight: @badge-font-weight; color: @badge-color; line-height: @badge-line-height; - vertical-align: baseline; + vertical-align: middle; white-space: nowrap; text-align: center; background-color: @badge-bg; @@ -28,7 +28,9 @@ position: relative; top: -1px; } - .btn-xs & { + + .btn-xs &, + .btn-group-xs > .btn & { top: 0; padding: 1px 5px; } @@ -44,11 +46,20 @@ } // 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; } |