From b0b24795b24ee6809397fbbadf42f31f310a219f Mon Sep 17 00:00:00 2001
From: Agustin Henze <tin@sluc.org.ar>
Date: Wed, 8 Jul 2015 07:35:02 -0300
Subject: Imported Upstream version 7.6.0

---
 bower_components/bootstrap/less/badges.less | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'bower_components/bootstrap/less/badges.less')

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;
   }
-- 
cgit v1.2.3