From d78d9dc5d9284cc2cfb86517acba10028a418783 Mon Sep 17 00:00:00 2001
From: Kevin Kirsche <kkirsche@ansfederal.com>
Date: Tue, 10 Feb 2015 08:57:56 -0500
Subject: [PATCH] Remove separate area for dropup's
Condense the dropup example
---
docs/_includes/components/dropdowns.html | 31 +++++++++---------------
1 file changed, 12 insertions(+), 19 deletions(-)
diff --git a/docs/_includes/components/dropdowns.html b/docs/_includes/components/dropdowns.html
index 8b3e02912a..d28fcce390 100644
--- a/docs/_includes/components/dropdowns.html
+++ b/docs/_includes/components/dropdowns.html
@@ -4,7 +4,7 @@
<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 @@
<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,24 +42,6 @@
<li role="presentation"><a role="menuitem" tabindex="-1" href="#">Separated link</a></li>
</ul>
</div>
-{% endhighlight %}
-
- <h3 id="dropdowns-dropup">Dropup variation</h3>
- <p>Trigger dropdown menus above elements by adding <code>.dropup</code> to the parent.</p>
- <div class="bs-example" data-example-id="static-dropup">
- <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="dropup">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-expanded="true">
Dropdown
--
GitLab