diff options
| author | Mark Otto <[email protected]> | 2012-07-30 12:15:08 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-07-30 12:15:08 -0700 |
| commit | 2b31caae2d5ddf69da4a341ac8becdd53cc79cc8 (patch) | |
| tree | 2a2de965dedcef301cce7e9062453f1b8b10c8b8 | |
| parent | 47d66e0a3f9a65208853ae67b71aa108ae813d1c (diff) | |
| download | bootstrap-2b31caae2d5ddf69da4a341ac8becdd53cc79cc8.tar.xz bootstrap-2b31caae2d5ddf69da4a341ac8becdd53cc79cc8.zip | |
fix navbar form alignment, and update examples to show these cases
| -rw-r--r-- | fluid.html | 14 | ||||
| -rw-r--r-- | hero.html | 5 |
2 files changed, 8 insertions, 11 deletions
diff --git a/fluid.html b/fluid.html index e39ea8b1a..24ea26582 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> @@ -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> |