Merge pull request twbs#11217 from ZDroid/nest

Add quick fix to labels and badges in buttons
20111564 · Dec 1, 2013 · 5283e51 · 5283e51
2 parents 67d4e33 + 9a2d169
commit 5283e51
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git 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
@@ -28,6 +28,12 @@
   &:empty {
     display: none;
   }
+
+  // Quick fix for labels in buttons
+  .btn & {
+    position: relative;
+    top: -1px;
+  }
 }
 
 // Colors