diff options
| author | Mark Otto <[email protected]> | 2014-07-13 00:23:09 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-13 00:23:09 -0700 |
| commit | d85e6af91b994d90e0078d41ac701080205443d2 (patch) | |
| tree | e61a4b86d96e5a725cfff1694aeb08612e327150 | |
| parent | fecbaca9076067445df6e4e16d33b277d3c3b1a7 (diff) | |
| parent | 2c540b7e330eb2e8ecedfd7d62fb603f96ee39db (diff) | |
| download | bootstrap-d85e6af91b994d90e0078d41ac701080205443d2.tar.xz bootstrap-d85e6af91b994d90e0078d41ac701080205443d2.zip | |
Merge branch 'master' into derp
Conflicts:
docs/_includes/components/alerts.html
docs/javascript/dropdowns.md
| -rw-r--r-- | docs/javascript/dropdowns.md | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/docs/javascript/dropdowns.md b/docs/javascript/dropdowns.md index e8682b66d..8a8c07c45 100644 --- a/docs/javascript/dropdowns.md +++ b/docs/javascript/dropdowns.md @@ -130,12 +130,13 @@ title: Dropdowns </ul> </div> {% endhighlight %} - <p>To keep URLs intact, use the <code>data-target</code> attribute instead of <code>href="#"</code>.</p> + <p>To keep URLs intact with link buttons, use the <code>data-target</code> attribute instead of <code>href="#"</code>.</p> {% highlight html %} <div class="dropdown"> - <button id="dLabel" type="button" data-toggle="dropdown">Dropdown trigger</button> - Dropdown - </button> + <a id="dLabel" data-target="#" href="http://example.com" type="button" data-toggle="dropdown"> + Dropdown trigger + <span class="caret"></span> + </a> <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel"> ... |