Commit 643bd8ea authored by Mark Otto's avatar Mark Otto
Browse files

Merge pull request #18787 from twbs/btn-vars

Add variables for spacing of .btn-toolbar and split-button dropdown toggles
parents dfae3d46 fb71efae
34 merge requests!28721Hot test,!27561Adds font-weight-medium to font weight classes,!26437merge,!26197V4 dev xmr,!20778V4 dev,!20539Allow multiple modals,!18988Blockquote border width,!20854Fixes 15534,!19272V4 dev xmr grunt html,!19581V4 fix popover,!20493V4 dev display,!20636Fix docs for heading sizes,!19824blockquote-center,!22547Finished a new translation for bootstrap,!19534Docs 17264,!18704Extend form docs with example form errors,!19533Npm deps,!22143Fix selectable disabled toggle radio buttons,!19084V4 rhythm,!22598test,!18829Add prefix to carousel classes,!18864Feature/navbar toggler support color schemes,!19602V4 palettes arun,!19448New pull request for testing,!19358XXL grid size,!19825.blockquote-center,!25326Adjust examples,!23995Add back cursor: pointer for .btn-link,!23178Spinner,!19754Issue template,!19753Card img overlay padding,!19747Blockquote border width,!19580ExitStars,!17021v4
Showing with 10 additions and 6 deletions
+10 -6
......@@ -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
......
......@@ -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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment