aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-11-28 02:10:23 -0800
committerMark Otto <[email protected]>2012-11-28 02:10:23 -0800
commitbf3a5df371dc58cc4030bf0177b2be964054d4d8 (patch)
tree1c99d51f39b51ae3b98df2b4de6797729fe66a9a
parent783120dffaab396955b0ad237bf3a82a73a6e1dc (diff)
downloadbootstrap-bf3a5df371dc58cc4030bf0177b2be964054d4d8.tar.xz
bootstrap-bf3a5df371dc58cc4030bf0177b2be964054d4d8.zip
Fixes #5930: redeclare font-size for popoves in btn-groups
-rw-r--r--docs/assets/css/bootstrap.css3
-rw-r--r--less/button-groups.less3
2 files changed, 4 insertions, 2 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index b25535eb6..8bdd175d6 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3591,7 +3591,8 @@ input[type="submit"].btn.btn-mini {
}
.btn-group > .btn,
-.btn-group > .dropdown-menu {
+.btn-group > .dropdown-menu,
+.btn-group > .popover {
font-size: 14px;
}
diff --git a/less/button-groups.less b/less/button-groups.less
index 2963c75de..c830852b2 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -40,7 +40,8 @@
margin-left: -1px;
}
.btn-group > .btn,
-.btn-group > .dropdown-menu {
+.btn-group > .dropdown-menu,
+.btn-group > .popover {
font-size: @baseFontSize; // redeclare as part 2 of font-size inline-block hack
}