2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-24 14:04:09 +03:00

fixing conflict in dividers in navbar, fix navbar docs, fix search form in navbar

This commit is contained in:
Mark Otto
2012-01-05 23:24:19 -08:00
parent 7582520808
commit 5cb76037ae
7 changed files with 18 additions and 16 deletions
+5 -6
View File
@@ -267,7 +267,6 @@
<div class="page-header">
<h1>Navbar</h1>
</div>
<h2>Fixed navbar</h2>
<div class="navbar navbar-static" >
<div class="navbar-inner">
<div class="container" style="width: auto;">
@@ -287,11 +286,11 @@
</ul>
</li>
</ul>
<form class="form-search navbar-search pull-left" action="">
<form class="navbar-search pull-left" action="">
<input type="text" class="search-query span2" placeholder="Search">
</form>
<ul class="nav secondary-nav">
<li class="divider"></li>
<li class="vertical-divider"></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>
<ul class="dropdown-menu">
@@ -308,15 +307,15 @@
<div class="row">
<div class="span4">
<h4>What is it</h4>
<h3>What is it</h3>
<p>Our navbar is a fixed bar that houses a websites logo or name, primary navigation, and search form.</p>
</div>
<div class="span4">
<h4>Customizable</h4>
<h3>Customizable</h3>
<p>All elements within, and the entire navbar as well, are optional. You can choose to include a logo/name, nav, search, and a secondary nav&mdash;or any combination of that.</p>
</div>
<div class="span4">
<h4>Dropdowns included</h4>
<h3>Dropdowns included</h3>
<p>As part of the main navigation, weve included the ability for you to add dropdowns to your nav. Check out the secondary nav above (right aligned) to see how its done. Dropdowns <code>&lt;li&gt;</code> tags also support <code>.active</code> for showing current page selection.</p>
</div>
</div>