From: Mark Otto <markd.otto@gmail.com>
Date: Wed, 2 Sep 2015 03:29:07 +0000 (-0700)
Subject: Merge pull request #17353 from dmbaughman/v4-navbar-example
X-Git-Tag: v4.0.0-alpha.2~367
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b17f5cadd5563c5ae530b64f221dcdc6e9f7c8b4;p=thirdparty%2Fbootstrap.git

Merge pull request #17353 from dmbaughman/v4-navbar-example

v4 - Updated default navbar example to use responsive navbar
---

b17f5cadd5563c5ae530b64f221dcdc6e9f7c8b4
diff --cc docs/examples/navbar/index.html
index 2871ef8365,78461da283..51328c7953
--- a/docs/examples/navbar/index.html
+++ b/docs/examples/navbar/index.html
@@@ -40,9 -54,10 +54,10 @@@
        <!-- Main component for a primary marketing message or call to action -->
        <div class="jumbotron">
          <h1>Navbar example</h1>
-         <p>This example is a quick exercise to illustrate how the default navbar works. It's placed within a <code>.container</code> to limit its width and will scroll with the rest of the page's content.</p>
+         <p>This example is a quick exercise to illustrate how the default responsive navbar works. It's placed within a <code>.container</code> to limit its width and will scroll with the rest of the page's content.</p>
+         <p>At the smallest breakpoint, the collapse plugin is used to hide the links and show a menu button to toggle the collapsed content.</p>
          <p>
 -          <a class="btn btn-lg btn-primary" href="../../components/#navbar" role="button">View navbar docs &raquo;</a>
 +          <a class="btn btn-lg btn-primary" href="../../components/navbar" role="button">View navbar docs &raquo;</a>
          </p>
        </div>