From: Mark Otto <markotto@twitter.com>
Date: Mon, 30 Jul 2012 19:15:08 +0000 (-0700)
Subject: fix navbar form alignment, and update examples to show these cases
X-Git-Tag: v3.0.0~81^2~11^2~1^2~106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b31caae2d5ddf69da4a341ac8becdd53cc79cc8;p=thirdparty%2Fbootstrap.git

fix navbar form alignment, and update examples to show these cases
---

diff --git a/fluid.html b/fluid.html
index e39ea8b1a9..24ea26582f 100644
--- a/fluid.html
+++ b/fluid.html
@@ -44,18 +44,10 @@
             <span class="icon-bar"></span>
           </a>
           <a class="brand" href="#">Project name</a>
-          <div class="btn-group pull-right">
-            <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
-              <i class="icon-user"></i> Username
-              <span class="caret"></span>
-            </a>
-            <ul class="dropdown-menu">
-              <li><a href="#">Profile</a></li>
-              <li class="divider"></li>
-              <li><a href="#">Sign Out</a></li>
-            </ul>
-          </div>
           <div class="nav-collapse collapse">
+            <p class="navbar-text pull-right">
+              Logged in as <a href="#" class="navbar-link">Username</a>
+            </p>
             <ul class="nav">
               <li class="active"><a href="#">Home</a></li>
               <li><a href="#about">About</a></li>
diff --git a/hero.html b/hero.html
index 32f6561bde..3efe568eb8 100644
--- a/hero.html
+++ b/hero.html
@@ -47,6 +47,11 @@
               <li><a href="#about">About</a></li>
               <li><a href="#contact">Contact</a></li>
             </ul>
+            <form class="navbar-form pull-right">
+              <input class="span2" type="text" placeholder="Email">
+              <input class="span2" type="password" placeholder="Password">
+              <button type="submit" class="btn">Sign in</button>
+            </form>
           </div><!--/.nav-collapse -->
         </div>
       </div>