diff options
Diffstat (limited to 'docs/_includes/components')
| -rw-r--r-- | docs/_includes/components/dropdowns.html | 4 | ||||
| -rw-r--r-- | docs/_includes/components/navs.html | 19 |
2 files changed, 19 insertions, 4 deletions
diff --git a/docs/_includes/components/dropdowns.html b/docs/_includes/components/dropdowns.html index 4462900ef..eabfd9ca7 100644 --- a/docs/_includes/components/dropdowns.html +++ b/docs/_includes/components/dropdowns.html @@ -40,10 +40,6 @@ <h4>May require additional positioning</h4> <p>Dropdowns are automatically positioned via CSS within the normal flow of the document. This means dropdowns may be cropped by parents with certain <code>overflow</code> properties or appear out of bounds of the viewport. Address these issues on your own as they arise.</p> </div> - <div class="bs-callout bs-callout-warning"> - <h4>Deprecated <code>.pull-right</code> alignment</h4> - <p>As of v3.1.0, we've deprecated <code>.pull-right</code> on dropdown menus. To right-align a menu, use <code>.dropdown-menu-right</code>. Right-aligned nav components in the navbar use a mixin version of this class to automatically align the menu. To override it, use <code>.dropdown-menu-left</code>.</p> - </div> {% highlight html %} <ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="dLabel"> ... diff --git a/docs/_includes/components/navs.html b/docs/_includes/components/navs.html index 5fc151b1e..9e7600ac4 100644 --- a/docs/_includes/components/navs.html +++ b/docs/_includes/components/navs.html @@ -3,6 +3,25 @@ <p class="lead">Navs available in Bootstrap have shared markup, starting with the base <code>.nav</code> class, as well as shared states. Swap modifier classes to switch between each style.</p> + <h2 id="nav-basic">Basic nav</h2> + <p>Uses no modifier classes. No supported active state by default, given highly customizable nature of nav styles.</p> + <div class="bs-example"> + <ul class="nav" role="tablist"> + <li> + <a href="#">Active</a> + </li> + <li> + <a href="#">Link</a> + </li> + <li> + <a href="#">Another link</a> + </li> + <li class="disabled"> + <a href="#">Disabled</a> + </li> + </ul> + </div> + <h2 id="nav-tabs">Tabs</h2> <p>Note the <code>.nav-tabs</code> class requires the <code>.nav</code> base class.</p> <div class="bs-example"> |
