From 848701a1b3f4152a1c8b6b9dbb09ac805d779cc2 Mon Sep 17 00:00:00 2001 From: Kevin Kirsche Date: Wed, 21 Jan 2015 12:01:25 -0500 Subject: [PATCH 1/2] Fix issue twbs/bootstrap#15561 Fix issue twbs/bootstrap#15561 regarding badges not shrinking to fit inside of .btn-group-xs --- less/badges.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/less/badges.less b/less/badges.less index 0817323a6ced..650b2134c67f 100644 --- a/less/badges.less +++ b/less/badges.less @@ -29,7 +29,7 @@ top: -1px; } - .btn-xs & { + .btn-xs &, .btn-group-xs > .btn & { top: 0; padding: 1px 5px; } From 4c5d1faa3578918d6976f3e6fe32cb4a399210bd Mon Sep 17 00:00:00 2001 From: Kevin Kirsche Date: Wed, 21 Jan 2015 16:38:58 -0500 Subject: [PATCH 2/2] Fix having multiple selectors on a single line. --- less/badges.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/less/badges.less b/less/badges.less index 650b2134c67f..c70bb939ebe2 100644 --- a/less/badges.less +++ b/less/badges.less @@ -29,7 +29,8 @@ top: -1px; } - .btn-xs &, .btn-group-xs > .btn & { + .btn-xs &, + .btn-group-xs > .btn & { top: 0; padding: 1px 5px; }