Merge pull request #15662 from kkirsche/patch-5

Fix issue #15597 — Mention dropup variation in dropdown docs
twbs · Feb 19, 2015 · 0b10c6b · 0b10c6b
2 parents ed627eb + d78d9dc
commit 0b10c6b
Showing 1 changed file with 30 additions and 7 deletions.
diff --git a/docs/_includes/components/dropdowns.html b/docs/_includes/components/dropdowns.html
@@ -4,7 +4,7 @@ <h1 id="dropdowns" class="page-header">Dropdowns</h1>
   <p class="lead">Toggleable, contextual menu for displaying lists of links. Made interactive with the <a href="../javascript/#dropdowns">dropdown JavaScript plugin</a>.</p>
 
   <h3 id="dropdowns-example">Example</h3>
-  <p>Wrap the dropdown's trigger and the dropdown menu within <code>.dropdown</code>, or another element that declares <code>position: relative;</code>. Then add the menu's HTML.</p>
+  <p>Wrap the dropdown's trigger and the dropdown menu within <code>.dropdown</code>, or another element that declares <code>position: relative;</code>. Then add the menu's HTML. Dropdown menus can also be triggered above elements by adding <code>.dropup</code> to the parent.</p>
   <div class="bs-example" data-example-id="static-dropdown">
     <div class="dropdown clearfix">
       <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-expanded="true">
@@ -17,6 +17,17 @@ <h3 id="dropdowns-example">Example</h3>
         <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Something else here</a></li>
       </ul>
     </div>
+    <div class="dropup clearfix">
+      <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-expanded="true">
+        Dropdown
+        <span class="caret"></span>
+      </button>
+      <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu2">
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Action</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Another action</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Something else here</a></li>
+      </ul>
+    </div>
   </div><!-- /example -->
 {% highlight html %}
 <div class="dropdown">
@@ -31,6 +42,18 @@ <h3 id="dropdowns-example">Example</h3>
     <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Separated link</a></li>
   </ul>
 </div>
+<div class="dropup">
+  <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-expanded="true">
+    Dropdown
+    <span class="caret"></span>
+  </button>
+  <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu2">
+    <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Action</a></li>
+    <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Another action</a></li>
+    <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Something else here</a></li>
+    <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Separated link</a></li>
+  </ul>
+</div>
 {% endhighlight %}
 
   <h3 id="dropdowns-alignment">Alignment</h3>
@@ -53,11 +76,11 @@ <h3 id="dropdowns-headers">Headers</h3>
   <p>Add a header to label sections of actions in any dropdown menu.</p>
   <div class="bs-example">
     <div class="dropdown clearfix">
-      <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-expanded="true">
+      <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu3" data-toggle="dropdown" aria-expanded="true">
         Dropdown
         <span class="caret"></span>
       </button>
-      <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu2">
+      <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu3">
         <li role="presentation" class="dropdown-header">Dropdown header</li>
         <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Action</a></li>
         <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Another action</a></li>
@@ -68,7 +91,7 @@ <h3 id="dropdowns-headers">Headers</h3>
     </div>
   </div><!-- /example -->
 {% highlight html %}
-<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu2">
+<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu3">
   ...
   <li role="presentation" class="dropdown-header">Dropdown header</li>
   ...
@@ -104,19 +127,19 @@ <h3 id="dropdowns-disabled">Disabled menu items</h3>
   <p>Add <code>.disabled</code> to a <code>&lt;li&gt;</code> in the dropdown to disable the link.</p>
   <div class="bs-example">
     <div class="dropdown clearfix">
-      <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu3" data-toggle="dropdown" aria-expanded="true">
+      <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu4" data-toggle="dropdown" aria-expanded="true">
         Dropdown
         <span class="caret"></span>
       </button>
-      <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu3">
+      <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu4">
         <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Regular link</a></li>
         <li role="presentation" class="disabled"><a role="menuitem" tabindex="-1" href="#">Disabled link</a></li>
         <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Another link</a></li>
       </ul>
     </div>
   </div><!-- /example -->
 {% highlight html %}
-<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu3">
+<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu4">
   <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Regular link</a></li>
   <li role="presentation" class="disabled"><a role="menuitem" tabindex="-1" href="#">Disabled link</a></li>
   <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Another link</a></li>