aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-01-15 13:08:35 -0800
committerMark Otto <[email protected]>2014-01-15 13:08:35 -0800
commita633fc042d4060499964fca7333edc5ac55cde4b (patch)
tree4422ee5ec858137d5b07a34e662dd1c493a6f06b /less
parentcae63200d8a645f385349debd940666ddbca0b38 (diff)
parent1facbf6e7a32cfb1334e9c84a59c762c27f13cb5 (diff)
downloadbootstrap-a633fc042d4060499964fca7333edc5ac55cde4b.tar.xz
bootstrap-a633fc042d4060499964fca7333edc5ac55cde4b.zip
Merge branch 'master' into docs_derp
Conflicts: docs/components.html docs/css.html
Diffstat (limited to 'less')
-rw-r--r--less/badges.less4
1 files changed, 4 insertions, 0 deletions
diff --git a/less/badges.less b/less/badges.less
index 166b2be5e..56828cab7 100644
--- a/less/badges.less
+++ b/less/badges.less
@@ -28,6 +28,10 @@
position: relative;
top: -1px;
}
+ .btn-xs & {
+ top: 0;
+ padding: 1px 5px;
+ }
}
// Hover state, but only for links