Drop .label component. Instead, just use .badge because fuck dupe code and stuff.

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 829c27039319d92dc06acbc51102d647ecabaa3a..299049115aac2c507af15da11ac119d4616b80ff 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4521,7 +4521,6 @@ a.thumbnail:hover {
   list-style: none;
 }
 
-.label,
 .badge {
   display: inline-block;
   padding: 2px 4px;
@@ -4533,87 +4532,64 @@ a.thumbnail:hover {
   white-space: nowrap;
   vertical-align: baseline;
   background-color: #999999;
-}
-
-.label {
   border-radius: 3px;
 }
 
-.badge {
-  padding-right: 9px;
-  padding-left: 9px;
-  border-radius: 9px;
-}
-
-.label:empty,
 .badge:empty {
   display: none;
 }
 
-a.label:hover,
 a.badge:hover {
   color: #fff;
   text-decoration: none;
   cursor: pointer;
 }
 
-.label-danger,
 .badge-danger {
   background-color: #b94a48;
 }
 
-.label-danger[href],
 .badge-danger[href] {
   background-color: #953b39;
 }
 
-.label-warning,
 .badge-warning {
   background-color: #f89406;
 }
 
-.label-warning[href],
 .badge-warning[href] {
   background-color: #c67605;
 }
 
-.label-success,
 .badge-success {
   background-color: #468847;
 }
 
-.label-success[href],
 .badge-success[href] {
   background-color: #356635;
 }
 
-.label-info,
 .badge-info {
   background-color: #3a87ad;
 }
 
-.label-info[href],
 .badge-info[href] {
   background-color: #2d6987;
 }
 
-.label-inverse,
 .badge-inverse {
   background-color: #333333;
 }
 
-.label-inverse[href],
 .badge-inverse[href] {
   background-color: #1a1a1a;
 }
 
-.btn .label,
 .btn .badge {
   position: relative;
   top: -1px;
 }
 
-.btn-mini .label,
 .btn-mini .badge {
   top: 0;
 }

diff --git a/less/labels-badges.less b/less/badges.less
similarity index 86%
rename from less/labels-badges.less
rename to less/badges.less
index 8440cc4691426383a1c0e37019af9acf54d4be8e..b8de24df1a5ef81fa9c1fc96f53bc39ee8542f82 100644 (file)
--- a/less/labels-badges.less
+++ b/less/badges.less
@@ -4,7 +4,6 @@
 
 
 // Base classes
-.label,
 .badge {
   display: inline-block;
   padding: 2px 4px;
@@ -16,29 +15,17 @@
   white-space: nowrap;
   text-shadow: 0 -1px 0 rgba(0,0,0,.25);
   background-color: @grayLight;
-}
-// Set unique padding and border-radii
-.label {
   border-radius: 3px;
-}
-.badge {
-  padding-left: 9px;
-  padding-right: 9px;
-  border-radius: 9px;
-}
 
-// Empty labels/badges collapse
-.label,
-.badge {
+  // Empty labels/badges collapse
   &:empty {
     display: none;
   }
 }
 
 // Hover state, but only for links
-a {
-  &.label:hover,
-  &.badge:hover {
+a.badge {
+  &:hover {
     color: #fff;
     text-decoration: none;
     cursor: pointer;
@@ -47,7 +34,6 @@ a {
 
 // Colors
 // Only give background-color difference to links (and to simplify, we don't qualifty with `a` but [href] attribute)
-.label,
 .badge {
   // Important (red)
   &-danger            { background-color: @state-error-text; }
@@ -68,14 +54,12 @@ a {
 
 // Quick fix for labels/badges in buttons
 .btn {
-  .label,
   .badge {
     position: relative;
     top: -1px;
   }
 }
 .btn-mini {
-  .label,
   .badge {
     top: 0;
   }

diff --git a/less/bootstrap.less b/less/bootstrap.less
index 93773ee4e436fa4fa8ce2e1bd895f26901769cef..1ed13496ba531349e1b092e5f683536d2bfb664f 100644 (file)
--- a/less/bootstrap.less
+++ b/less/bootstrap.less
@@ -52,7 +52,7 @@
 // Components: Misc
 @import "thumbnails.less";
 @import "media.less";
-@import "labels-badges.less";
+@import "badges.less";
 @import "progress-bars.less";
 @import "accordion.less";
 @import "carousel.less";