Merge branch 'master' of github.com:twbs/bootstrap

c64c8636 · Mark Otto · af9c7151 · 5e26ad49 · c64c8636 · c64c8636
Commit c64c8636 authored Jan 21, 2015 by Mark Otto
Showing with 5 additions and 3 deletions

dist/css/bootstrap.css dist/css/bootstrap.css +2 -1

dist/css/bootstrap.css.map dist/css/bootstrap.css.map +0 -0

dist/css/bootstrap.min.css dist/css/bootstrap.min.css +1 -1

less/badges.less less/badges.less +2 -1

No files found.
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -4825,7 +4825,8 @@ a.label:focus {
  position: relative;
  top: -1px;
 }
-.btn-xs .badge {
+.btn-xs .badge,
+.btn-group-xs > .btn .badge {
  top: 0;
  padding: 1px 5px;
 }

--- a/dist/css/bootstrap.css.map
+++ b/dist/css/bootstrap.css.map
--- a/dist/css/bootstrap.min.css
+++ b/dist/css/bootstrap.min.css
--- a/less/badges.less
+++ b/less/badges.less
@@ -29,7 +29,8 @@
    top: -1px;
  }

-  .btn-xs & {
+  .btn-xs &,
+  .btn-group-xs > .btn & {
    top: 0;
    padding: 1px 5px;
  }