From b091dd5e86e90c2e073d665a895d6afc0baf7978 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 27 Oct 2014 04:52:22 -0700 Subject: rename new navbar to just navbar --- docs/components/navbar.md | 168 ++++++++++++++++++++++++++++++++++++++++++ docs/components/new-navbar.md | 168 ------------------------------------------ 2 files changed, 168 insertions(+), 168 deletions(-) create mode 100644 docs/components/navbar.md delete mode 100644 docs/components/new-navbar.md (limited to 'docs/components') diff --git a/docs/components/navbar.md b/docs/components/navbar.md new file mode 100644 index 000000000..1b124d026 --- /dev/null +++ b/docs/components/navbar.md @@ -0,0 +1,168 @@ +--- +layout: page +title: New navbar +--- + +The navbar is a simple wrapper for positioning branding, navigation, and other elements. It's easily extensible and with the help of our collapse plugin it can easily integrate offscreen content. + +### Basics + +Here's what you need to know before getting started with the navbar: + +- Navbars require a wrapping `.navbar` and either a color scheme class or custom styles. +- When using multiple components in a navbar, some [alignment classes](#alignment) are required. +- Navbars and their contents are fluid by default. Use [optional containers](#containers) to limit their horizontal width. + +### Branding + +Name your company, product, or project with `.navbar-brand`. + +{% example html %} +
+

+ Navbar +

+
+{% endexample %} + +### Navigation + +Use `.nav-pills` within a navbar for basic navigation. + +{% example html %} +
+ +
+{% endexample %} + +### Inline forms + +Add an `.inline-form` within the navbar with nearly any combination of form controls and buttons. + +{% example html %} +
+
+ + +
+
+{% endexample %} + +### Containers + +Although it's not required, you can wrap a navbar in a `.container` or add one within for basic horizontal control. + +{% example html %} +
+
+

+ Navbar +

+
+
+{% endexample %} + +{% example html %} +
+
+

+ Navbar +

+
+
+{% endexample %} + +### Alignment + +Use `.pull-left` or `.pull-right` to align multiple elements within the navbar. + +{% example html %} +
+

+ Navbar +

+ + +
+{% endexample %} + +### Inverse color scheme + +Replace `.navbar-default` with `.navbar-inverse` for a darker background color and white text. + +{% example html %} +
+

+ Navbar +

+ +
+ + +
+
+{% endexample %} + +### Collapsible content + +Our collapse plugin allows you to use a ` + +{% endexample %} diff --git a/docs/components/new-navbar.md b/docs/components/new-navbar.md deleted file mode 100644 index 1b124d026..000000000 --- a/docs/components/new-navbar.md +++ /dev/null @@ -1,168 +0,0 @@ ---- -layout: page -title: New navbar ---- - -The navbar is a simple wrapper for positioning branding, navigation, and other elements. It's easily extensible and with the help of our collapse plugin it can easily integrate offscreen content. - -### Basics - -Here's what you need to know before getting started with the navbar: - -- Navbars require a wrapping `.navbar` and either a color scheme class or custom styles. -- When using multiple components in a navbar, some [alignment classes](#alignment) are required. -- Navbars and their contents are fluid by default. Use [optional containers](#containers) to limit their horizontal width. - -### Branding - -Name your company, product, or project with `.navbar-brand`. - -{% example html %} -
-

- Navbar -

-
-{% endexample %} - -### Navigation - -Use `.nav-pills` within a navbar for basic navigation. - -{% example html %} -
- -
-{% endexample %} - -### Inline forms - -Add an `.inline-form` within the navbar with nearly any combination of form controls and buttons. - -{% example html %} -
-
- - -
-
-{% endexample %} - -### Containers - -Although it's not required, you can wrap a navbar in a `.container` or add one within for basic horizontal control. - -{% example html %} -
-
-

- Navbar -

-
-
-{% endexample %} - -{% example html %} -
-
-

- Navbar -

-
-
-{% endexample %} - -### Alignment - -Use `.pull-left` or `.pull-right` to align multiple elements within the navbar. - -{% example html %} -
-

- Navbar -

- - -
-{% endexample %} - -### Inverse color scheme - -Replace `.navbar-default` with `.navbar-inverse` for a darker background color and white text. - -{% example html %} -
-

- Navbar -

- -
- - -
-
-{% endexample %} - -### Collapsible content - -Our collapse plugin allows you to use a ` - -{% endexample %} -- cgit v1.2.3