From: Mark Otto <markdotto@gmail.com>
Date: Thu, 15 Sep 2016 17:20:57 +0000 (-0700)
Subject: Merge branch 'v4-dev' into v4-navbars
X-Git-Tag: v4.0.0-alpha.5~4^2~17^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64dcb8b5073293daa911d2b274fd875f31693317;p=thirdparty%2Fbootstrap.git

Merge branch 'v4-dev' into v4-navbars
---

64dcb8b5073293daa911d2b274fd875f31693317
diff --cc docs/components/navbar.md
index a82f881a21,10f445e8f0..bb390a55c4
--- a/docs/components/navbar.md
+++ b/docs/components/navbar.md
@@@ -304,25 -241,9 +304,23 @@@ Our collapse plugin allows you to use 
  
  {% example html %}
  <nav class="navbar navbar-light bg-faded">
-   <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#exCollapsingNavbar" aria-controls="exCollapsingNavbar" aria-expanded="false" aria-label="Toggle navigation">
-     &#9776;
-   </button>
+   <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#exCollapsingNavbar" aria-controls="exCollapsingNavbar" aria-expanded="false" aria-label="Toggle navigation"></button>
    <div class="collapse" id="exCollapsingNavbar">
 -    <div class="bg-inverse p-a-1">
 +    <div class="bg-inverse text-muted p-a-1">
 +      <h4>Collapsed content</h4>
 +      <span class="text-muted">Toggleable via the navbar brand.</span>
 +    </div>
 +  </div>
 +</nav>
 +{% endexample %}
 +
 +{% example html %}
 +<nav class="navbar navbar-dark bg-inverse">
 +  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#exCollapsingNavbarDark" aria-controls="exCollapsingNavbarDark" aria-expanded="false" aria-label="Toggle navigation">
 +    &#9776;
 +  </button>
 +  <div class="collapse" id="exCollapsingNavbarDark">
 +    <div class="bg-inverse text-muted p-a-1">
        <h4>Collapsed content</h4>
        <span class="text-muted">Toggleable via the navbar brand.</span>
      </div>
diff --cc scss/_navbar.scss
index 6e563d4390,c91e830bdd..def526fdd1
--- a/scss/_navbar.scss
+++ b/scss/_navbar.scss
@@@ -116,12 -105,15 +116,15 @@@
  // Bootstrap JavaScript plugin.
  
  .navbar-toggler {
+   width: 2.5em;
+   height: 2em;
 -  padding: .5rem .75rem;
 -  font-size: $font-size-lg;
 +  padding: $navbar-toggler-padding-y $navbar-toggler-padding-x;
 +  font-size: $navbar-toggler-font-size;
    line-height: 1;
-   background: none;
+   background: transparent no-repeat center center;
+   background-size: 24px 24px;
    border: $border-width solid transparent;
 -  @include border-radius($btn-border-radius);
 +  @include border-radius($navbar-toggler-border-radius);
  
    @include hover-focus {
      text-decoration: none;