From: Luis Aleman <Luis@toppatch.com>
Date: Wed, 14 Aug 2013 17:31:29 +0000 (-0400)
Subject: Add .navbar-header, and correct .nav-collapse
X-Git-Tag: v3.0.0~81^2~66^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80ff4bf870716dd140592813b4c854781d32c22f;p=thirdparty%2Fbootstrap.git

Add .navbar-header, and correct .nav-collapse
---

diff --git a/javascript.html b/javascript.html
index 3797dbf65d..707c7329ab 100644
--- a/javascript.html
+++ b/javascript.html
@@ -357,14 +357,16 @@ $('#myModal').on('hidden.bs.modal', function () {
     <div class="bs-example">
       <nav id="navbar-example" class="navbar navbar-static" role="navigation">
         <div class="container" style="width: auto;">
-          <a class="navbar-brand" href="#">Project Name</a>
-          <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-js-navbar-collapse">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <div class="nav-collapse collapse bs-js-navbar-collapse">
+          <div class="navbar-header">
+            <a class="navbar-brand" href="#">Project Name</a>
+            <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-js-navbar-collapse">
+              <span class="sr-only">Toggle navigation</span>
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
+            </button>
+          </div>
+          <div class="navbar-collapse collapse bs-js-navbar-collapse">
             <ul class="nav navbar-nav">
               <li class="dropdown">
                 <a id="drop1" href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
@@ -528,7 +530,9 @@ $('#myDropdown').on('show.bs.dropdown', function () {
     <div class="bs-example">
       <nav id="navbar-example2" class="navbar navbar-static" role="navigation">
         <div class="container" style="width: auto;">
-          <a class="navbar-brand" href="#">Project Name</a>
+          <div class="navbar-header">
+            <a class="navbar-brand" href="#">Project Name</a>
+          </div>
           <ul class="nav navbar-nav">
             <li><a href="#fat">@fat</a></li>
             <li><a href="#mdo">@mdo</a></li>