mirror of
https://github.com/Hopiu/bootstrap.git
synced 2026-05-09 12:54:42 +00:00
fix navbar form alignment, and update examples to show these cases
This commit is contained in:
parent
47d66e0a3f
commit
2b31caae2d
2 changed files with 8 additions and 11 deletions
14
fluid.html
14
fluid.html
|
|
@ -44,18 +44,10 @@
|
||||||
<span class="icon-bar"></span>
|
<span class="icon-bar"></span>
|
||||||
</a>
|
</a>
|
||||||
<a class="brand" href="#">Project name</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">
|
<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">
|
<ul class="nav">
|
||||||
<li class="active"><a href="#">Home</a></li>
|
<li class="active"><a href="#">Home</a></li>
|
||||||
<li><a href="#about">About</a></li>
|
<li><a href="#about">About</a></li>
|
||||||
|
|
|
||||||
|
|
@ -47,6 +47,11 @@
|
||||||
<li><a href="#about">About</a></li>
|
<li><a href="#about">About</a></li>
|
||||||
<li><a href="#contact">Contact</a></li>
|
<li><a href="#contact">Contact</a></li>
|
||||||
</ul>
|
</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><!--/.nav-collapse -->
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue