aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-01-21 18:50:33 -0800
committerMark Otto <[email protected]>2015-01-21 18:50:33 -0800
commit2641ba6f0f4d3a616976005f5a1017741ad9da1d (patch)
treecb65ab53aaecf8e964e9a996f4757f29789da01b
parentc8be2a063ae45497021a96dc53dc2d066f214867 (diff)
parent4c5d1faa3578918d6976f3e6fe32cb4a399210bd (diff)
downloadbootstrap-2641ba6f0f4d3a616976005f5a1017741ad9da1d.tar.xz
bootstrap-2641ba6f0f4d3a616976005f5a1017741ad9da1d.zip
Merge pull request #15628 from kkirsche/patch-1
[Fix Issue #15561] Fix badges not being resized inside .btn-group-xs if .btn-xs is not applied
-rw-r--r--less/badges.less3
1 files changed, 2 insertions, 1 deletions
diff --git a/less/badges.less b/less/badges.less
index 0817323a6..c70bb939e 100644
--- 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;
}