Badges, navs, and more

3 files changed, 19 insertions, 11 deletions

diff --git a/less/badges.less b/less/badges.less
index 0c448b56f..87f92de6c 100644
--- a/less/badges.less
+++ b/less/badges.less
@@ -5,16 +5,16 @@
 
 // Base class
 .badge {
+  position: relative;
+  top: -.1em;
   display: inline-block;
-  min-width: 10px;
-  padding: 3px 7px;
-  font-size: @font-size-small;
+  padding-left: .6em;
+  padding-right: .6em;
+  font-size: .75em;
   font-weight: @badge-font-weight;
   color: @badge-color;
-  line-height: @badge-line-height;
-  vertical-align: baseline;
-  white-space: nowrap;
   text-align: center;
+  white-space: nowrap;
   background-color: @badge-bg;
   .border-radius(@badge-border-radius);
 
@@ -23,14 +23,20 @@
     display: none;
   }
 
+  &.pull-left,
+  &.pull-right {
+    top: .2em;
+  }
+
   // Quick fix for badges in buttons
-  .btn & {
+/*  .btn & {
     position: relative;
     top: -1px;
   }
+*/
   .btn-xs & {
-    top: 0;
-    padding: 1px 5px;
+    /*top: 0;*/
+    /*padding: 1px 5px;*/
   }
 
   // Hover state, but only for links
diff --git a/less/navs.less b/less/navs.less
index 7a211819d..3782fdf8d 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -20,6 +20,8 @@
       position: relative;
       display: block;
       padding: @nav-link-padding;
+      line-height: @line-height-base;
+
       &:hover,
       &:focus {
         text-decoration: none;
diff --git a/less/variables.less b/less/variables.less
index c7a99e5cb..328380bcc 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -369,7 +369,7 @@
 //##
 
 //=== Shared nav styles
-@nav-link-padding:                          10px 15px;
+@nav-link-padding:                          .5em 1em;
 @nav-link-hover-bg:                         @gray-lighter;
 
 @nav-disabled-link-color:                   @gray-light;
@@ -675,7 +675,7 @@
 
 @badge-font-weight:           bold;
 @badge-line-height:           1;
-@badge-border-radius:         10px;
+@badge-border-radius:         2em;
 
 
 //== Breadcrumbs