mirror/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-24 03:40:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:twbs/bootstrap

Browse Source
This commit is contained in:
Mark Otto 2013-11-30 16:37:49 -08:00
commit ed98ac7560
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
less/badges.less
View File

@ -22,6 +22,12 @@
&:empty { &:empty {
display: none; display: none;
} }
// Quick fix for badges in buttons
.btn & {
position: relative;
top: -1px;
}
} }
// Hover state, but only for links // Hover state, but only for links
@ -34,12 +40,6 @@ a.badge {
} }
} }
// Quick fix for labels/badges in buttons
.btn .badge {
position: relative;
top: -1px;
}
// Account for counters in navs // Account for counters in navs
a.list-group-item.active > .badge, a.list-group-item.active > .badge,
.nav-pills > .active > a > .badge { .nav-pills > .active > a > .badge {

6
less/labels.less
View File

@ -28,6 +28,12 @@
&:empty { &:empty {
display: none; display: none;
} }
// Quick fix for labels in buttons
.btn & {
position: relative;
top: -1px;
}
} }
// Colors // Colors