Hopiu/bootstrap
1
0
Fork 0
mirror of https://github.com/Hopiu/bootstrap.git synced 2026-03-29 10:40:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into derp

Browse source 
Conflicts:
	docs/_includes/components/alerts.html
	docs/javascript/dropdowns.md
This commit is contained in:
Mark Otto 2014-07-13 00:23:09 -07:00
commit d85e6af91b
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
docs/javascript/dropdowns.md
View file

@ -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">
...