Skip to content

Commit c64c863

Browse files
committed
Merge branch 'master' of github.com:twbs/bootstrap
2 parents af9c715 + 5e26ad4 commit c64c863

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

dist/css/bootstrap.css

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

less/badges.less

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
top: -1px;
3030
}
3131

32-
.btn-xs & {
32+
.btn-xs &,
33+
.btn-group-xs > .btn & {
3334
top: 0;
3435
padding: 1px 5px;
3536
}

0 commit comments

Comments
 (0)