Merge branch 'v4-dev' into v4-split-buttons

diff --cc scss/_dropdown.scss
Simple merge

diff --cc scss/_variables.scss
index 860d061b548f4c1cc1ed76c7b762f70c63b98eba,55fa88a8e8c4c384e709c4c46f4474a9cb219632..bbdbe24c4d62216bb0f64e8a3f23f696fb0c5b74
--- 1/scss/_variables.scss
--- 2/scss/_variables.scss
+++ b/scss/_variables.scss
@@@ -268,21 -289,17 +289,21 @@@ $btn-danger-border:              $btn-d
  
  $btn-link-disabled-color:        $gray-light !default;
  
- $btn-padding-x-sm:               .75rem !default;
+ $btn-padding-x-sm:               .5rem !default;
  $btn-padding-y-sm:               .25rem !default;
  
- $btn-padding-x-lg:               1.25rem !default;
+ $btn-padding-x-lg:               1.5rem !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;
 +$btn-block-spacing-y:            .5rem !default;
 +$btn-toolbar-margin:             .5rem !default;
 +
 +$btn-dropdown-toggle-split-l:    (strip-unit($btn-padding-x) - ($caret-width * 1.5)) !default;
 +$btn-dropdown-toggle-split-r:    (strip-unit($btn-padding-x) - ($caret-width * .5)) !default;
 +$btn-dropdown-toggle-split-l-sm: (strip-unit($btn-padding-x-sm) - ($caret-width * 1.5)) !default;
 +$btn-dropdown-toggle-split-r-sm: (strip-unit($btn-padding-x-sm) - ($caret-width * .5)) !default;
 +$btn-dropdown-toggle-split-l-lg: (strip-unit($btn-padding-x-lg) - ($caret-width-lg * 1.5)) !default;
 +$btn-dropdown-toggle-split-r-lg: (strip-unit($btn-padding-x-lg) - ($caret-width-lg * .5)) !default;
  
  // Allows for customizing button radius independently from global border radius
  $btn-border-radius:              $border-radius !default;

diff --cc scss/bootstrap.scss
Simple merge