diff options
| author | Mark Otto <[email protected]> | 2013-12-15 11:16:57 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-15 11:16:57 -0800 |
| commit | fd62247bf8bbb1bce072f5ee03e996dfc4abed94 (patch) | |
| tree | 487766325e03d40c7af16c58873b70d8638a72ba /components.html | |
| parent | fbf31f965e27a6665c7e0f2d97eb74c0df7585d4 (diff) | |
| parent | 2b86e05a6150ef13905519070ea82ce895fbae85 (diff) | |
| download | bootstrap-fd62247bf8bbb1bce072f5ee03e996dfc4abed94.tar.xz bootstrap-fd62247bf8bbb1bce072f5ee03e996dfc4abed94.zip | |
Merge branch 'master' into cover_template
Diffstat (limited to 'components.html')
| -rw-r--r-- | components.html | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/components.html b/components.html index 8377b8123..91495c38e 100644 --- a/components.html +++ b/components.html @@ -902,9 +902,13 @@ base_url: "../" {% endhighlight %} <h3 id="dropdowns-alignment">Alignment options</h3> - <p>Add <code>.pull-right</code> to a <code>.dropdown-menu</code> to right align the dropdown menu.</p> + <p>Add <code>.dropdown-menu-right</code> to a <code>.dropdown-menu</code> to right align the dropdown menu.</p> + <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> + </div> {% highlight html %} -<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dLabel"> +<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="dLabel"> ... </ul> {% endhighlight %} @@ -1099,7 +1103,7 @@ base_url: "../" {% endhighlight %} <h3 id="btn-groups-vertical">Vertical variation</h3> - <p>Make a set of buttons appear vertically stacked rather than horizontally.</p> + <p>Make a set of buttons appear vertically stacked rather than horizontally. <strong class="text-danger">Split button dropdowns are not supported here.</strong></p> <div class="bs-example"> <div class="btn-group-vertical"> <button type="button" class="btn btn-default">Button</button> |