0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-03-13 13:29:25 +01:00

Merge pull request #11217 from ZDroid/nest

Add quick fix to labels and badges in buttons
This commit is contained in:
Mark Otto 2013-11-30 16:26:38 -08:00
commit 5283e518cc
2 changed files with 12 additions and 6 deletions

View File

@ -22,6 +22,12 @@
&:empty {
display: none;
}
// Quick fix for badges in buttons
.btn & {
position: relative;
top: -1px;
}
}
// 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
a.list-group-item.active > .badge,
.nav-pills > .active > a > .badge {

View File

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