From: Mark Otto <markdotto@gmail.com>
Date: Wed, 21 Dec 2016 22:32:21 +0000 (-0800)
Subject: rearrange examples, go center nav only instead of trying to hack centered with siblings
X-Git-Tag: v4.0.0-alpha.6~278
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c7bd17f0f51dc7a0c58154a5262e64a84930959;p=thirdparty%2Fbootstrap.git

rearrange examples, go center nav only instead of trying to hack centered with siblings
---

diff --git a/docs/examples/navbars/index.html b/docs/examples/navbars/index.html
index ec2839be28..265ec3a23a 100644
--- a/docs/examples/navbars/index.html
+++ b/docs/examples/navbars/index.html
@@ -51,14 +51,46 @@
       </div>
     </nav>
 
-    <nav class="navbar navbar-dark bg-inverse flex-items-md-between">
+    <nav class="navbar navbar-dark bg-inverse">
+      <div class="container">
+        <button class="navbar-toggler navbar-toggler-right hidden-lg-up" type="button" data-toggle="collapse" data-target="#navbarsExampleContainer" aria-controls="navbarsExampleContainer" aria-expanded="false" aria-label="Toggle navigation"></button>
+        <a class="navbar-brand" href="#">Container</a>
+
+        <div class="collapse navbar-toggleable-md" id="navbarsExampleContainer">
+          <ul class="nav navbar-nav">
+            <li class="nav-item active">
+              <a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" href="#">Link</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link disabled" href="#">Disabled</a>
+            </li>
+            <li class="nav-item dropdown">
+              <a class="nav-link dropdown-toggle" href="http://example.com" id="supportedContentDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Dropdown</a>
+              <div class="dropdown-menu" aria-labelledby="supportedContentDropdown">
+                <a class="dropdown-item" href="#">Action</a>
+                <a class="dropdown-item" href="#">Another action</a>
+                <a class="dropdown-item" href="#">Something else here</a>
+              </div>
+            </li>
+          </ul>
+          <form class="form-inline mt-2 mt-md-0">
+            <input class="form-control mr-md-2" type="text" placeholder="Search">
+            <button class="btn btn-outline-success my-2 my-md-0" type="submit">Search</button>
+          </form>
+        </div>
+      </div>
+    </nav>
+
+    <nav class="navbar navbar-dark bg-inverse">
       <button class="navbar-toggler navbar-toggler-right hidden-lg-up" type="button" data-toggle="collapse" data-target="#navbarsExampleCenteredNav" aria-controls="navbarsExampleCenteredNav" aria-expanded="false" aria-label="Toggle navigation"></button>
-      <a class="navbar-brand" href="#">Centered nav</a>
 
       <div class="collapse navbar-toggleable-md" id="navbarsExampleCenteredNav">
         <ul class="nav navbar-nav text-md-center">
           <li class="nav-item active">
-            <a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a>
+            <a class="nav-link" href="#">Centered nav only <span class="sr-only">(current)</span></a>
           </li>
           <li class="nav-item">
             <a class="nav-link" href="#">Link</a>
@@ -75,19 +107,15 @@
             </div>
           </li>
         </ul>
-        <form class="form-inline mt-2 mt-md-0">
-          <input class="form-control mr-md-2" type="text" placeholder="Search">
-          <button class="btn btn-outline-success my-2 my-md-0" type="submit">Search</button>
-        </form>
       </div>
     </nav>
 
-    <nav class="navbar navbar-dark bg-inverse">
-      <div class="container">
-        <button class="navbar-toggler navbar-toggler-right hidden-lg-up" type="button" data-toggle="collapse" data-target="#navbarsExampleContainer" aria-controls="navbarsExampleContainer" aria-expanded="false" aria-label="Toggle navigation"></button>
-        <a class="navbar-brand" href="#">Container</a>
+    <div class="container">
+      <nav class="navbar navbar-light bg-faded rounded">
+        <button class="navbar-toggler navbar-toggler-right hidden-lg-up" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault" aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation"></button>
+        <a class="navbar-brand" href="#">Navbar</a>
 
-        <div class="collapse navbar-toggleable-md" id="navbarsExampleContainer">
+        <div class="collapse navbar-toggleable-md" id="navbarsExampleDefault">
           <ul class="nav navbar-nav">
             <li class="nav-item active">
               <a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a>
@@ -112,18 +140,15 @@
             <button class="btn btn-outline-success my-2 my-md-0" type="submit">Search</button>
           </form>
         </div>
-      </div>
-    </nav>
+      </nav>
 
-    <nav class="navbar navbar-dark bg-inverse">
-      <div class="container flex-items-md-between">
-        <button class="navbar-toggler navbar-toggler-right hidden-lg-up" type="button" data-toggle="collapse" data-target="#navbarsExampleContainer" aria-controls="navbarsExampleContainer" aria-expanded="false" aria-label="Toggle navigation"></button>
-        <a class="navbar-brand" href="#">Container &amp; Center</a>
+      <nav class="navbar navbar-light bg-faded rounded">
+        <button class="navbar-toggler navbar-toggler-right hidden-lg-up" type="button" data-toggle="collapse" data-target="#navbarsExampleCenteredNav" aria-controls="navbarsExampleCenteredNav" aria-expanded="false" aria-label="Toggle navigation"></button>
 
-        <div class="collapse navbar-toggleable-md" id="navbarsExampleContainer">
+        <div class="collapse navbar-toggleable-md" id="navbarsExampleCenteredNav">
           <ul class="nav navbar-nav text-md-center">
             <li class="nav-item active">
-              <a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a>
+              <a class="nav-link" href="#">Centered nav only <span class="sr-only">(current)</span></a>
             </li>
             <li class="nav-item">
               <a class="nav-link" href="#">Link</a>
@@ -140,17 +165,8 @@
               </div>
             </li>
           </ul>
-          <form class="form-inline mt-2 mt-md-0">
-            <input class="form-control mr-md-2" type="text" placeholder="Search">
-            <button class="btn btn-outline-success my-2 my-md-0" type="submit">Search</button>
-          </form>
         </div>
-      </div>
-    </nav>
-
-
-    <div class="container">
-
+      </nav>
 
       <div class="jumbotron">
         <div class="col-sm-8 mx-auto">