aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-12-10 10:59:57 -0800
committerMark Otto <[email protected]>2012-12-10 10:59:57 -0800
commitcddca18f122887b183aa3a8e601c5cd1aa80c206 (patch)
tree2a53cb5411318de5d91dfb5bc20d1ceeaebe67ec
parent9d985978a3a5b341911d23c3b7fcf83178ef8e34 (diff)
downloadbootstrap-cddca18f122887b183aa3a8e601c5cd1aa80c206.tar.xz
bootstrap-cddca18f122887b183aa3a8e601c5cd1aa80c206.zip
Fixes #6174: Caret alignment in small and mini buttons
-rw-r--r--docs/assets/css/bootstrap.css7
-rw-r--r--less/button-groups.less6
2 files changed, 9 insertions, 4 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 53f3a8cb1..842eb4c30 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3744,8 +3744,6 @@ input[type="submit"].btn.btn-mini {
margin-left: 0;
}
-.btn-mini .caret,
-.btn-small .caret,
.btn-large .caret {
margin-top: 6px;
}
@@ -3756,6 +3754,11 @@ input[type="submit"].btn.btn-mini {
border-left-width: 5px;
}
+.btn-mini .caret,
+.btn-small .caret {
+ margin-top: 8px;
+}
+
.dropup .btn-large .caret {
border-bottom-width: 5px;
}
diff --git a/less/button-groups.less b/less/button-groups.less
index d6054c808..55cdc6033 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -164,8 +164,6 @@
margin-left: 0;
}
// Carets in other button sizes
-.btn-mini .caret,
-.btn-small .caret,
.btn-large .caret {
margin-top: 6px;
}
@@ -174,6 +172,10 @@
border-right-width: 5px;
border-top-width: 5px;
}
+.btn-mini .caret,
+.btn-small .caret {
+ margin-top: 8px;
+}
// Upside down carets for .dropup
.dropup .btn-large .caret {
border-bottom-width: 5px;