1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-26 14:54:27 +02:00

update docs to change topbar to navbar

This commit is contained in:
Mark Otto
2011-10-17 20:44:52 -07:00
parent b91d210a3c
commit ae5c5e1063
2 changed files with 21 additions and 21 deletions

View File

@@ -25,7 +25,7 @@
<body>
<!-- Topbar
<!-- Navbar
================================================== -->
<div class="navbar navbar-fixed" data-scrollspy="scrollspy">
<div class="navbar-inner">
@@ -1308,7 +1308,7 @@
<div class="page-header">
<h1>Navigation</h1>
</div>
<h2>Fixed topbar</h2>
<h2>Fixed navbar</h2>
<div class="navbar navbar-static" data-dropdown="dropdown">
<div class="navbar-inner">
<div class="container">
@@ -1343,24 +1343,24 @@
</li>
</ul>
</div>
</div><!-- /topbar-inner -->
</div><!-- /topbar -->
</div><!-- /navbar-inner -->
</div><!-- /navbar -->
<div class="row">
<div class="span4">
<h4>What is it</h4>
<p>Our topbar is a fixed bar that houses a websites logo or name, primary navigation, and search form.</p>
<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>
<p>All elements within, and the entire topbar 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>
<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>
<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>
<p><strong>Note:</strong> When using the topbar on any page, be sure to account for the overlap it causes by adding <code>padding-top: 40px;</code> to your <code>&lt;body&gt;</code>.</p>
<p><strong>Note:</strong> When using the navbar on any page, be sure to account for the overlap it causes by adding <code>padding-top: 40px;</code> to your <code>&lt;body&gt;</code>.</p>
<br>
@@ -1875,11 +1875,11 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
</tr>
<tr>
<td><a href="./javascript.html#dropdowns">bootstrap-dropdown.js</a></td>
<td>This plugin is for adding dropdown interaction to the bootstrap topbar or tabbed navigations.</td>
<td>This plugin is for adding dropdown interaction to the bootstrap navbar or tabbed navigations.</td>
</tr>
<tr>
<td><a href="./javascript.html#scrollspy">bootstrap-scrollspy.js</a></td>
<td>The ScrollSpy plugin is for adding an auto updating nav based on scroll position to the bootstrap topbar.</td>
<td>The ScrollSpy plugin is for adding an auto updating nav based on scroll position to the bootstrap navbar.</td>
</tr>
<tr>
<td><a href="./javascript.html#tabs">bootstrap-tabs.js</a></td>