mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-27 22:09:04 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into derp

Browse Source 
Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	docs/_includes/components/progress-bars.html
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map
This commit is contained in:
Mark Otto
2014-07-11 00:38:28 -07:00
parent f6482aadcd c3ae289f4a
commit cabb86d126
11 changed files with 106 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/_includes/js/dropdowns.html
View File

@@ -104,7 +104,7 @@
<p>Add <code>data-toggle="dropdown"</code> to a link or button to toggle a dropdown.</p>
{% highlight html %}
<div class="dropdown">
<a data-toggle="dropdown" href="#">Dropdown trigger</a>
<a id="dLabel" role="button" data-toggle="dropdown" href="#">Dropdown trigger</a>
<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
...
</ul>
@@ -117,7 +117,6 @@
Dropdown
</a>
<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
...
</ul>