From: Mark Otto Date: Sat, 30 Mar 2013 20:16:34 +0000 (-0700) Subject: navbar links in sidenav X-Git-Tag: v3.0.0-rc1~528 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=62df38586a046064fcb93e26f7644801e8b4ca17;p=thirdparty%2Fbootstrap.git navbar links in sidenav --- diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html index ae5e58e1de..682bf75aaa 100644 --- a/docs/_includes/docs-nav.html +++ b/docs/_includes/docs-nav.html @@ -117,12 +117,13 @@
  • Navbar
  • Breadcrumbs
    • diff --git a/docs/docs.html b/docs/docs.html index 6648092e2e..f6f4f48300 100644 --- a/docs/docs.html +++ b/docs/docs.html @@ -3277,7 +3277,7 @@ For example, <section> should be wrapped as inline. -

    Basic navbar

    +

    To start, navbars are static (not fixed to the top) and include support for a project name and basic navigation. Place one anywhere within a .container, which sets the width of your site and content.

    @@ -3302,7 +3302,7 @@ For example, <section> should be wrapped as inline.

    Navbar components

    -

    Brand

    +

    A simple link to show your brand or project name only requires an anchor tag.

    @@ -3313,7 +3313,7 @@ For example, <section> should be wrapped as inline. Title {% endhighlight %} -

    Nav links

    +

    Nav items are simple to add via unordered lists.

    @@ -3352,7 +3352,7 @@ For example, <section> should be wrapped as inline. {% endhighlight %} -

    Forms

    +

    To properly style and position a form within the navbar, add the appropriate classes as shown below. For a default form, include .navbar-form and either .pull-left or .pull-right to properly align it.

    @@ -3382,7 +3382,7 @@ For example, <section> should be wrapped as inline.

    Optional display variations

    Fix the navbar to the top or bottom of the viewport with an additional class on the outermost div, .navbar.

    -

    Fixed to top

    +

    Add .navbar-fixed-top and remember to account for the hidden area underneath it by adding at least 40px padding to the <body>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.

    @@ -3402,7 +3402,7 @@ For example, <section> should be wrapped as inline.
    {% endhighlight %} -

    Fixed to bottom

    +

    Add .navbar-fixed-bottom instead.

    @@ -3422,7 +3422,7 @@ For example, <section> should be wrapped as inline.
    {% endhighlight %} -

    Static top navbar

    +

    Create a full-width navbar that scrolls away with the page by adding .navbar-static-top. Unlike the .navbar-fixed-top class, you do not need to change any padding on the body.

    @@ -3443,7 +3443,7 @@ For example, <section> should be wrapped as inline. {% endhighlight %} -

    Responsive navbar

    +

    To implement a collapsing responsive navbar, wrap your navbar content in a containing div, .nav-collapse.collapse, and add the navbar toggle button, .navbar-toggle.