]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
fix up navbar top and fixed top examples
authorMark Otto <markdotto@gmail.com>
Thu, 22 Dec 2016 04:51:15 +0000 (20:51 -0800)
committerMark Otto <markd.otto@gmail.com>
Thu, 22 Dec 2016 21:48:07 +0000 (13:48 -0800)
docs/examples/navbar-top-fixed/index.html
docs/examples/navbar-top/index.html

index 7e4d1e72e8dbcf3cf0bccb28d80788c37192d2ed..6f2964720e043273a128391514821f68e27dec89 100644 (file)
 
   <body>
 
-    <div class="pos-f-t">
-      <div class="collapse" id="navbar-header">
-        <div class="container-fluid bg-inverse text-white pt-1">
-          <h3>Collapsed content</h3>
-          <p>Toggleable via the navbar brand.</p>
-        </div>
+    <nav class="navbar navbar-dark navbar-fixed-top navbar-toggleable-md bg-inverse">
+      <button class="navbar-toggler navbar-toggler-right hidden-lg-up" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation"></button>
+      <a class="navbar-brand" href="#">Fixed navbar</a>
+      <div class="collapse navbar-collapse" id="navbarCollapse">
+        <ul class="nav navbar-nav mt-2 mt-lg-0">
+          <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>
+        </ul>
+        <form class="form-inline mt-2 mt-lg-0">
+          <input class="form-control mr-md-2" type="text" placeholder="Search">
+          <button class="btn btn-outline-success my-2 my-lg-0" type="submit">Search</button>
+        </form>
       </div>
-      <div class="navbar navbar-light bg-faded">
-        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-header" aria-controls="navbar-header" aria-expanded="false" aria-label="Toggle navigation"></button>
-      </div>
-    </div>
+    </nav>
 
     <div class="container">
       <div class="jumbotron">
index 241a4e3aad8e446a2c65ebbc496ab586248005af..e685523856726da3bad38d0aae48f524cd9fe811 100644 (file)
 
   <body>
 
-    <div class="collapse" id="navbar-header">
-      <div class="container-fluid bg-inverse text-white pt-1">
-        <h3>Collapsed content</h3>
-        <p>Toggleable via the navbar brand.</p>
+    <nav class="navbar navbar-dark navbar-toggleable-md bg-inverse mb-3">
+      <button class="navbar-toggler navbar-toggler-right hidden-lg-up" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation"></button>
+      <a class="navbar-brand" href="#">Fixed navbar</a>
+      <div class="collapse navbar-collapse" id="navbarCollapse">
+        <ul class="nav navbar-nav mt-2 mt-lg-0">
+          <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>
+        </ul>
+        <form class="form-inline mt-2 mt-lg-0">
+          <input class="form-control mr-md-2" type="text" placeholder="Search">
+          <button class="btn btn-outline-success my-2 my-lg-0" type="submit">Search</button>
+        </form>
       </div>
-    </div>
-    <div class="navbar navbar-light bg-faded mb-1">
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-header" aria-controls="navbar-header" aria-expanded="false" aria-label="Toggle navigation"></button>
-    </div>
+    </nav>
 
     <div class="container">
       <div class="jumbotron">