diff options
| author | Mark Otto <[email protected]> | 2014-01-29 22:18:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-29 22:18:29 -0800 |
| commit | d2f1887bb5e7b651b11d6dd22ce191c733717a83 (patch) | |
| tree | 18aec6ab68ae29013e85a4a184baf33afa346769 /docs/components.html | |
| parent | e38fd138ce04d73e03100a3ea42496fc914120e9 (diff) | |
| parent | 9195d8e8eb51208e4272e4c7e0851e2695da1a0d (diff) | |
| download | bootstrap-d2f1887bb5e7b651b11d6dd22ce191c733717a83.tar.xz bootstrap-d2f1887bb5e7b651b11d6dd22ce191c733717a83.zip | |
Merge branch 'master' into pr/12388
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'docs/components.html')
| -rw-r--r-- | docs/components.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/components.html b/docs/components.html index aab22cfd8..06b69ad1a 100644 --- a/docs/components.html +++ b/docs/components.html @@ -111,7 +111,7 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns, </div> <div class="bs-callout bs-callout-warning"> <h4>Deprecated <code>.pull-right</code> alignment</h4> - <p>As of v3.1, 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> + <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"> |