diff options
| author | Chris Rebert <[email protected]> | 2014-11-11 21:22:27 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-11-11 21:22:30 -0800 |
| commit | b87370c28f6f8cd0d2de6cc541dcba22788e4001 (patch) | |
| tree | a7521a29405c6ed5f8f176ec98034d4a9a8bf456 /docs | |
| parent | ff386147ce341a15f02b31f638500487246e34da (diff) | |
| download | bootstrap-b87370c28f6f8cd0d2de6cc541dcba22788e4001.tar.xz bootstrap-b87370c28f6f8cd0d2de6cc541dcba22788e4001.zip | |
navbar callouts cleanup
Move all callouts to be adjacent to each other
Combine JS-related callouts into a single callout
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/_includes/components/navbar.html | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/docs/_includes/components/navbar.html b/docs/_includes/components/navbar.html index e876e80a3..67a9faa93 100644 --- a/docs/_includes/components/navbar.html +++ b/docs/_includes/components/navbar.html @@ -15,13 +15,18 @@ </ol> </div> <div class="bs-callout bs-callout-danger"> - <h4>Requires JavaScript</h4> + <h4>Requires JavaScript plugin</h4> <p>If JavaScript is disabled and the viewport is narrow enough that the navbar collapses, it will be impossible to expand the navbar and view the content within the <code>.navbar-collapse</code>.</p> + <p>The responsive navbar requires the <a href="../javascript/#collapse">collapse plugin</a> to be included in your version of Bootstrap.</p> </div> <div class="bs-callout bs-callout-info"> <h4>Changing the collapsed mobile navbar breakpoint</h4> <p>The navbar collapses into its vertical mobile view when the viewport is narrower than <code>@grid-float-breakpoint</code>, and expands into its horizontal non-mobile view when the viewport is at least <code>@grid-float-breakpoint</code> in width. Adjust this variable in the Less source to control when the navbar collapses/expands. The default value is <code>768px</code> (the smallest "small" or "tablet" screen).</p> </div> + <div class="bs-callout bs-callout-warning"> + <h4>Make navbars accessible</h4> + <p>Be sure to add a <code>role="navigation"</code> to every navbar to help with accessibility.</p> + </div> <div class="bs-example"> <nav class="navbar navbar-default" role="navigation"> @@ -134,16 +139,6 @@ </nav> {% endhighlight %} - <div class="bs-callout bs-callout-danger"> - <h4>Plugin dependency</h4> - <p>The responsive navbar requires the <a href="../javascript/#collapse">collapse plugin</a> to be included in your version of Bootstrap.</p> - </div> - - <div class="bs-callout bs-callout-warning"> - <h4>Make navbars accessible</h4> - <p>Be sure to add a <code>role="navigation"</code> to every navbar to help with accessibility.</p> - </div> - <h2 id="navbar-brand-image">Brand image</h2> <p>Replace the navbar brand with your own image by swapping the text for an <code><img></code>. Since the <code>.navbar-brand</code> has its own padding and height, you may need to override some CSS depending on your image.</p> |