aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-11-30 16:26:38 -0800
committerMark Otto <[email protected]>2013-11-30 16:26:38 -0800
commit5283e518cccc87a5f3ac0f91748dfb1a9a3a23ae (patch)
treeccf54bad259da4c43e0238124a46e318ac2fe4d9
parent67d4e3323d322ec7c6719204ca02732576c7ee7e (diff)
parent9a2d16976285bd2f552a9c81bae719b4e7607bd0 (diff)
downloadbootstrap-5283e518cccc87a5f3ac0f91748dfb1a9a3a23ae.tar.xz
bootstrap-5283e518cccc87a5f3ac0f91748dfb1a9a3a23ae.zip
Merge pull request #11217 from ZDroid/nest
Add quick fix to labels and badges in buttons
-rw-r--r--less/badges.less12
-rw-r--r--less/labels.less6
2 files changed, 12 insertions, 6 deletions
diff --git a/less/badges.less b/less/badges.less
index 0b69753ef..166b2be5e 100644
--- a/less/badges.less
+++ b/less/badges.less
@@ -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 {
diff --git a/less/labels.less b/less/labels.less
index cad5ce516..5db1ed12c 100644
--- a/less/labels.less
+++ b/less/labels.less
@@ -28,6 +28,12 @@
&:empty {
display: none;
}
+
+ // Quick fix for labels in buttons
+ .btn & {
+ position: relative;
+ top: -1px;
+ }
}
// Colors