Merge pull request #15052 from twbs/badge-in-non-anchor-list-group-item

Badges: fix active styles when in non-anchor `.list-group-item`

less/badges.less

@@ -44,11 +44,17 @@
   }
 
   // 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;
   }

less/list-group.less

@@ -35,14 +35,6 @@
     margin-bottom: 0;
     .border-bottom-radius(@list-group-border-radius);
   }
-
-  // Align badges within list items
-  > .badge {
-    float: right;
-  }
-  > .badge + .badge {
-    margin-right: 5px;
-  }
 }