From 02097700e8ab24506dda5332778398119dc8b728 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 28 Nov 2012 00:31:52 -0800 Subject: Fixes #6035: use font-size vars in button groups --- less/button-groups.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'less/button-groups.less') diff --git a/less/button-groups.less b/less/button-groups.less index 8c3b9ff04..002a3ff07 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -46,13 +46,13 @@ // Reset fonts for other sizes .btn-group > .btn-mini { - font-size: 11px; + font-size: @fontSizeMini; } .btn-group > .btn-small { - font-size: 12px; + font-size: @fontSizeSmall; } .btn-group > .btn-large { - font-size: 16px; + font-size: @fontSizeLarge; } // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match -- cgit v1.2.3 From 783120dffaab396955b0ad237bf3a82a73a6e1dc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 28 Nov 2012 01:51:04 -0800 Subject: Fixes #5927: Scope button group 5px button left margin to immediate children --- less/button-groups.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'less/button-groups.less') diff --git a/less/button-groups.less b/less/button-groups.less index 002a3ff07..2963c75de 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -24,9 +24,9 @@ font-size: 0; // Hack to remove whitespace that results from using inline-block margin-top: @baseLineHeight / 2; margin-bottom: @baseLineHeight / 2; - .btn + .btn, - .btn-group + .btn, - .btn + .btn-group { + > .btn + .btn, + > .btn-group + .btn, + > .btn + .btn-group { margin-left: 5px; } } -- cgit v1.2.3 From bf3a5df371dc58cc4030bf0177b2be964054d4d8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 28 Nov 2012 02:10:23 -0800 Subject: Fixes #5930: redeclare font-size for popoves in btn-groups --- less/button-groups.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'less/button-groups.less') 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 } -- cgit v1.2.3 From 8fb36cb3dd60c34afdbb8e46cc457b2e8795b3c5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 28 Nov 2012 02:21:34 -0800 Subject: Fixes #5594: Vertical button groups show use max-width, not width, and be scoped to immediate children buttons only --- less/button-groups.less | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'less/button-groups.less') diff --git a/less/button-groups.less b/less/button-groups.less index c830852b2..d6054c808 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -203,25 +203,25 @@ display: inline-block; // makes buttons only take up the width they need .ie7-inline-block(); } -.btn-group-vertical .btn { +.btn-group-vertical > .btn { display: block; float: none; - width: 100%; + max-width: 100%; .border-radius(0); } -.btn-group-vertical .btn + .btn { +.btn-group-vertical > .btn + .btn { margin-left: 0; margin-top: -1px; } -.btn-group-vertical .btn:first-child { +.btn-group-vertical > .btn:first-child { .border-radius(@baseBorderRadius @baseBorderRadius 0 0); } -.btn-group-vertical .btn:last-child { +.btn-group-vertical > .btn:last-child { .border-radius(0 0 @baseBorderRadius @baseBorderRadius); } -.btn-group-vertical .btn-large:first-child { +.btn-group-vertical > .btn-large:first-child { .border-radius(@borderRadiusLarge @borderRadiusLarge 0 0); } -.btn-group-vertical .btn-large:last-child { +.btn-group-vertical > .btn-large:last-child { .border-radius(0 0 @borderRadiusLarge @borderRadiusLarge); } -- cgit v1.2.3