diff options
| author | Mark Otto <[email protected]> | 2014-07-11 00:38:28 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-11 00:38:28 -0700 |
| commit | cabb86d126584f48651431f431070dcf6bd9d76f (patch) | |
| tree | e6f2e8c5d7ba7fabdd54f48ac124466ffa308d62 /docs/_includes/js/dropdowns.html | |
| parent | f6482aadcd8498f2dc82907994f8ec69afec8613 (diff) | |
| parent | c3ae289f4a9e5fc14e489e3914d150954469f1ac (diff) | |
| download | bootstrap-cabb86d126584f48651431f431070dcf6bd9d76f.tar.xz bootstrap-cabb86d126584f48651431f431070dcf6bd9d76f.zip | |
Merge branch 'master' into derp
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
Diffstat (limited to 'docs/_includes/js/dropdowns.html')
| -rw-r--r-- | docs/_includes/js/dropdowns.html | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/docs/_includes/js/dropdowns.html b/docs/_includes/js/dropdowns.html index 78d8b2c8a..aa5b9df22 100644 --- a/docs/_includes/js/dropdowns.html +++ b/docs/_includes/js/dropdowns.html @@ -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> |