diff options
| author | Mark Otto <[email protected]> | 2016-01-07 00:47:40 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-01-07 00:47:40 -0800 |
| commit | 643bd8eaeb7a2a692fec3add22a3b61eff0fb62c (patch) | |
| tree | fbc195d494987551a031f16f5bb1f1641cc0fad5 | |
| parent | dfae3d46e43f52389b7e53f1172b95390276dfcb (diff) | |
| parent | fb71efaeb225d15107d648cea089558b83513ae8 (diff) | |
| download | bootstrap-643bd8eaeb7a2a692fec3add22a3b61eff0fb62c.tar.xz bootstrap-643bd8eaeb7a2a692fec3add22a3b61eff0fb62c.zip | |
Merge pull request #18787 from twbs/btn-vars
Add variables for spacing of .btn-toolbar and split-button dropdown toggles
| -rw-r--r-- | scss/_button-group.scss | 12 | ||||
| -rw-r--r-- | scss/_variables.scss | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/scss/_button-group.scss b/scss/_button-group.scss index 7efe144f9..e0c6c9af4 100644 --- a/scss/_button-group.scss +++ b/scss/_button-group.scss @@ -33,7 +33,7 @@ // Optional: Group multiple button groups together for a toolbar .btn-toolbar { - margin-left: -5px; // Offset the first child's margin + margin-left: -$btn-toolbar-margin; // Offset the first child's margin @include clearfix(); .btn-group, @@ -44,7 +44,7 @@ > .btn, > .btn-group, > .input-group { - margin-left: 5px; + margin-left: $btn-toolbar-margin; } } @@ -104,12 +104,12 @@ // Give the line between buttons some depth .btn-group > .btn + .dropdown-toggle { - padding-right: 8px; - padding-left: 8px; + padding-right: $split-btn-dropdown-toggle-padding-x; + padding-left: $split-btn-dropdown-toggle-padding-x; } .btn-group > .btn-lg + .dropdown-toggle { - padding-right: 12px; - padding-left: 12px; + padding-right: $split-btn-lg-dropdown-toggle-padding-x; + padding-left: $split-btn-lg-dropdown-toggle-padding-x; } // The clickable button for toggling the menu diff --git a/scss/_variables.scss b/scss/_variables.scss index 98456f89a..dec4d0b86 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -271,6 +271,10 @@ $btn-padding-x-lg: 1.25rem !default; $btn-padding-y-lg: .75rem !default; $btn-block-spacing-y: 5px !default; +$btn-toolbar-margin: 5px !default; + +$split-btn-dropdown-toggle-padding-x: 8px !default; +$split-btn-lg-dropdown-toggle-padding-x: 12px !default; // Allows for customizing button radius independently from global border radius $btn-border-radius: $border-radius !default; |