diff options
| author | Mark Otto <[email protected]> | 2012-11-22 22:04:21 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-22 22:04:21 -0800 |
| commit | 7e56e2265d67ae81ad8be52af4d56f189929207a (patch) | |
| tree | 8bede49f32e25f4acfe95a2a7cc86bd273805474 /less/button-groups.less | |
| parent | fa1c130552022520161a2b0c595e2ca431df0c97 (diff) | |
| parent | e0d0190803398ce12b2fe88e31e45993b35cf17e (diff) | |
| download | bootstrap-7e56e2265d67ae81ad8be52af4d56f189929207a.tar.xz bootstrap-7e56e2265d67ae81ad8be52af4d56f189929207a.zip | |
Merge branch '2.2.2-wip' into exploratory
Conflicts:
less/button-groups.less
Diffstat (limited to 'less/button-groups.less')
| -rw-r--r-- | less/button-groups.less | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/less/button-groups.less b/less/button-groups.less index 8a74b9e75..7b7c779ae 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -56,25 +56,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 @@ -200,14 +200,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; } |