Merge branch 'master' into gh-pages

1 files changed, 12 insertions, 8 deletions

diff --git a/src/labels.less b/src/labels.less
index 0764dd4..ac11630 100644
--- a/src/labels.less
+++ b/src/labels.less
@@ -1,16 +1,16 @@
 // Labels
 .label {
   display: inline-block;
-  padding: .2rem .5rem;
-  font-size: 1.2rem;
-  line-height: 1.4rem;
+  padding: .3rem .5rem;
+  font-size: 80%;
+  line-height: 1;
   color: #666;
   background-color: @core-border-color;
   text-align: center;
   white-space: nowrap;
   vertical-align: middle;
-  margin: -.2rem .5rem 0 0;
-  border-radius: 2px;
+  margin: -.3rem .5rem 0 .5rem;
+  border-radius: .2rem;
 
   &.label-primary {
     color: #fff;
@@ -20,8 +20,12 @@
     color: #fff;
     background-color: @control-color-success;
   }
+  &.label-info {
+    color: #fff;
+    background-color: @control-color-info;
+  }
   &.label-warning {
-    color: darken(@control-color-warning, 35%);
+    color: #fff;
     background-color: @control-color-warning;
   }
   &.label-danger {
@@ -30,8 +34,8 @@
   }
 
   &.label-lg {
+    font-size: 100%;
+    line-height: 1.2;
     padding: .3rem .8rem;
-    font-size: 1.4rem;
-    line-height: 1.6rem;
   }
 }
\ No newline at end of file