From: Mark Otto <markdotto@gmail.com>
Date: Mon, 17 Oct 2016 02:46:55 +0000 (-0700)
Subject: Merge branch 'v4-navbars' of github.com:twbs/bootstrap into v4-navbars
X-Git-Tag: v4.0.0-alpha.5~4^2~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=247ad23e97534f28038e285b15730bdd890fcb4c;p=thirdparty%2Fbootstrap.git

Merge branch 'v4-navbars' of github.com:twbs/bootstrap into v4-navbars
---

247ad23e97534f28038e285b15730bdd890fcb4c
diff --cc scss/_variables.scss
index e8a18790b7,754c3d35e8..c6c757aa96
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@@ -500,10 -498,10 +500,12 @@@ $navbar-brand-padding-y:            .25
  
  $navbar-divider-padding-y:          .425rem !default;
  
+ $navbar-toggler-padding-x:           .75rem !default;
+ $navbar-toggler-padding-y:           .5rem !default;
  $navbar-toggler-font-size:           $font-size-lg !default;
  $navbar-toggler-border-radius:       $btn-border-radius !default;
 +$navbar-toggler-padding-x:           .75rem !default;
 +$navbar-toggler-padding-y:           .5rem !default;
  
  $navbar-dark-color:                 rgba(255,255,255,.5) !default;
  $navbar-dark-hover-color:           rgba(255,255,255,.75) !default;