From: Mark Otto <markdotto@gmail.com>
Date: Wed, 11 May 2016 18:07:06 +0000 (-0700)
Subject: Merge branch 'v4-dev' into v4-split-buttons
X-Git-Tag: v4.0.0-alpha.3~84^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b280e36b788e4b42bbb359f0a13db410adf7dd8c;p=thirdparty%2Fbootstrap.git

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

b280e36b788e4b42bbb359f0a13db410adf7dd8c
diff --cc scss/_variables.scss
index 860d061b54,55fa88a8e8..bbdbe24c4d
--- a/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;