From ae5c5e10635049c65d73454ca9486539bdf324d4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 17 Oct 2011 20:44:52 -0700 Subject: [PATCH] update docs to change topbar to navbar --- docs/index.html | 18 +++++++++--------- docs/javascript.html | 24 ++++++++++++------------ 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/docs/index.html b/docs/index.html index 68cdd4a2cf..7fe5ce1ca7 100644 --- a/docs/index.html +++ b/docs/index.html @@ -25,7 +25,7 @@ -
@@ -1308,7 +1308,7 @@

Navigation

-

Fixed topbar

+

Fixed navbar

@@ -1343,24 +1343,24 @@
-
-
+
+

What is it

-

Our topbar is a fixed bar that houses a website’s logo or name, primary navigation, and search form.

+

Our navbar is a fixed bar that houses a website’s logo or name, primary navigation, and search form.

Customizable

-

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—or any combination of that.

+

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—or any combination of that.

Dropdowns included

As part of the main navigation, we’ve included the ability for you to add dropdowns to your nav. Check out the secondary nav above (right aligned) to see how it’s done. Dropdowns <li> tags also support .active for showing current page selection.

-

Note: When using the topbar on any page, be sure to account for the overlap it causes by adding padding-top: 40px; to your <body>.

+

Note: When using the navbar on any page, be sure to account for the overlap it causes by adding padding-top: 40px; to your <body>.


@@ -1875,11 +1875,11 @@ Lorem ipsum dolar sit amet illo error ipsum verita bootstrap-dropdown.js - This plugin is for adding dropdown interaction to the bootstrap topbar or tabbed navigations. + This plugin is for adding dropdown interaction to the bootstrap navbar or tabbed navigations. bootstrap-scrollspy.js - The ScrollSpy plugin is for adding an auto updating nav based on scroll position to the bootstrap topbar. + The ScrollSpy plugin is for adding an auto updating nav based on scroll position to the bootstrap navbar. bootstrap-tabs.js diff --git a/docs/javascript.html b/docs/javascript.html index da623c2f8f..68a3d0cd46 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -25,7 +25,7 @@ -
@@ -189,12 +189,12 @@ $('#my-modal').bind('hidden', function () {
-

This plugin is for adding dropdown interaction to the bootstrap topbar or tabbed navigations.

+

This plugin is for adding dropdown interaction to the Bootstrap navbar or tabbed navigations.

Download

Using boostrap-dropdown.js

- 
$('#topbar').dropdown()
+ 
$('#navbar').dropdown()

Markup

To quickly add dropdown functionality to any nav element, use the data-dropdown attribute. Any valid bootstrap dropdown will automatically be activated.

@@ -213,10 +213,10 @@ $('#my-modal').bind('hidden', function () {
           
Methods

           
$().dropdown()

           

-          A programatic api for activating menus for a given topbar or tabbed navigation.
+          A programatic api for activating menus for a given navbar or tabbed navigation.
           

           
Demo

-