From a10d68f291d1f0a0f47f3123d213fb686229692d Mon Sep 17 00:00:00 2001 From: Mark Otto <markdotto@gmail.com> Date: Sun, 18 Nov 2012 12:30:35 -0800 Subject: [PATCH] Fixes #5937: Border radius vars in button groups --- less/button-groups.less | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/less/button-groups.less b/less/button-groups.less index ca8a770d41..8c3b9ff045 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -58,25 +58,25 @@ // 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 .btn-group > .btn:first-child { margin-left: 0; - .border-top-left-radius(4px); - .border-bottom-left-radius(4px); + .border-top-left-radius(@baseBorderRadius); + .border-bottom-left-radius(@baseBorderRadius); } // Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it .btn-group > .btn:last-child, .btn-group > .dropdown-toggle { - .border-top-right-radius(4px); - .border-bottom-right-radius(4px); + .border-top-right-radius(@baseBorderRadius); + .border-bottom-right-radius(@baseBorderRadius); } // Reset corners for large buttons .btn-group > .btn.large:first-child { margin-left: 0; - .border-top-left-radius(6px); - .border-bottom-left-radius(6px); + .border-top-left-radius(@borderRadiusLarge); + .border-bottom-left-radius(@borderRadiusLarge); } .btn-group > .btn.large:last-child, .btn-group > .large.dropdown-toggle { - .border-top-right-radius(6px); - .border-bottom-right-radius(6px); + .border-top-right-radius(@borderRadiusLarge); + .border-bottom-right-radius(@borderRadiusLarge); } // On hover/focus/active, bring the proper btn to front @@ -213,14 +213,14 @@ margin-top: -1px; } .btn-group-vertical .btn:first-child { - .border-radius(4px 4px 0 0); + .border-radius(@baseBorderRadius @baseBorderRadius 0 0); } .btn-group-vertical .btn:last-child { - .border-radius(0 0 4px 4px); + .border-radius(0 0 @baseBorderRadius @baseBorderRadius); } .btn-group-vertical .btn-large:first-child { - .border-radius(6px 6px 0 0); + .border-radius(@borderRadiusLarge @borderRadiusLarge 0 0); } .btn-group-vertical .btn-large:last-child { - .border-radius(0 0 6px 6px); + .border-radius(0 0 @borderRadiusLarge @borderRadiusLarge); }