aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-06-25 20:57:04 -0700
committerMark Otto <[email protected]>2012-06-25 20:57:04 -0700
commitb77ed4a3a3c47af057e16db93ef41023d1cc5e08 (patch)
treeaebd86e7a2b90f7b1f9c34c3bba821ecaa7a7e27
parent244a9ab79d13a88b8bb5ef59665a82088edd62d9 (diff)
downloadbootstrap-b77ed4a3a3c47af057e16db93ef41023d1cc5e08.tar.xz
bootstrap-b77ed4a3a3c47af057e16db93ef41023d1cc5e08.zip
fix dropdowns in button groups after font-size hack
-rw-r--r--docs/assets/css/bootstrap.css6
-rw-r--r--less/button-groups.less5
2 files changed, 9 insertions, 2 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 73887ceeb..d4b1eb894 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3119,12 +3119,16 @@ input[type="submit"].btn.btn-mini {
.btn-group > .btn {
position: relative;
margin-left: -1px;
- font-size: 13px;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
+.btn-group > .btn,
+.btn-group > .dropdown-menu {
+ font-size: 13px;
+}
+
.btn-group > .btn-mini,
.btn-group > .btn-small {
font-size: 11px;
diff --git a/less/button-groups.less b/less/button-groups.less
index 44f13a09a..8234a893c 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -29,9 +29,12 @@
.btn-group > .btn {
position: relative;
margin-left: -1px;
- font-size: @baseFontSize; // redeclare as part 2 of font-size inline-block hack
.border-radius(0);
}
+.btn-group > .btn,
+.btn-group > .dropdown-menu {
+ font-size: @baseFontSize; // redeclare as part 2 of font-size inline-block hack
+}
// Reset fonts for other sizes
.btn-group > .btn-mini,