aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2016-01-06 16:41:37 -0800
committerChris Rebert <[email protected]>2016-01-06 16:42:21 -0800
commitfb71efaeb225d15107d648cea089558b83513ae8 (patch)
tree1e3ae7dec6e57b954314c29c8fea9f590f9a6db7
parent3f04c082dd30b04e1151098ee180ffe5974f3986 (diff)
downloadbootstrap-fb71efaeb225d15107d648cea089558b83513ae8.tar.xz
bootstrap-fb71efaeb225d15107d648cea089558b83513ae8.zip
Add variables for spacing of .btn-toolbar and split-button dropdown toggles
[skip sauce]
-rw-r--r--scss/_button-group.scss12
-rw-r--r--scss/_variables.scss4
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 5c1d07c36..9486dcbb2 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -276,6 +276,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;