From: Mark Otto Date: Wed, 28 Nov 2012 10:10:23 +0000 (-0800) Subject: Fixes #5930: redeclare font-size for popoves in btn-groups X-Git-Tag: v2.2.2~50 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bf3a5df371dc58cc4030bf0177b2be964054d4d8;p=thirdparty%2Fbootstrap.git Fixes #5930: redeclare font-size for popoves in btn-groups --- diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b25535eb6e..8bdd175d60 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 2963c75def..c830852b2b 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 }