From b77ed4a3a3c47af057e16db93ef41023d1cc5e08 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 25 Jun 2012 20:57:04 -0700
Subject: [PATCH] fix dropdowns in button groups after font-size hack
---
docs/assets/css/bootstrap.css | 6 +++++-
less/button-groups.less | 5 ++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 73887ceeba..d4b1eb8942 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 44f13a09a2..8234a893c8 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,
--
GitLab