diff options
| author | Mark Otto <[email protected]> | 2014-07-09 22:19:23 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-09 22:19:23 -0700 |
| commit | dae1a68fb15be9015760df32e85d764ef092db44 (patch) | |
| tree | 23dbce03ca690c069a35b3577377bff9a06cf432 /docs/_includes/js/dropdowns.html | |
| parent | 216bc3d68b6a9016b3c5fdf90d82cbb291a28f96 (diff) | |
| parent | 643effe382bb12b4ff1460e9e1987948b1763990 (diff) | |
| download | bootstrap-dae1a68fb15be9015760df32e85d764ef092db44.tar.xz bootstrap-dae1a68fb15be9015760df32e85d764ef092db44.zip | |
Merge branch 'master' into derp
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_includes/components/navs.html
docs/_includes/css/images.html
docs/_includes/js/dropdowns.html
docs/_includes/js/tabs.html
docs/assets/css/docs.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'docs/_includes/js/dropdowns.html')
| -rw-r--r-- | docs/_includes/js/dropdowns.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/_includes/js/dropdowns.html b/docs/_includes/js/dropdowns.html index f50b9f8f6..78d8b2c8a 100644 --- a/docs/_includes/js/dropdowns.html +++ b/docs/_includes/js/dropdowns.html @@ -60,8 +60,8 @@ <h3>Within pills</h3> <div class="bs-example"> <ul class="nav nav-pills" role="tablist"> - <li class="active"><a href="#">Regular link</a></li> - <li class="dropdown"> + <li role="presentation" class="active"><a href="#">Regular link</a></li> + <li role="presentation" class="dropdown"> <a id="drop4" role="button" data-toggle="dropdown" href="#">Dropdown</a> <ul id="menu1" class="dropdown-menu" role="menu" aria-labelledby="drop4"> <li role="presentation"><a role="menuitem" tabindex="-1" href="http://twitter.com/fat">Action</a></li> @@ -71,7 +71,7 @@ <li role="presentation"><a role="menuitem" tabindex="-1" href="http://twitter.com/fat">Separated link</a></li> </ul> </li> - <li class="dropdown"> + <li role="presentation" class="dropdown"> <a id="drop5" role="button" data-toggle="dropdown" href="#">Dropdown 2</a> <ul id="menu2" class="dropdown-menu" role="menu" aria-labelledby="drop5"> <li role="presentation"><a role="menuitem" tabindex="-1" href="http://twitter.com/fat">Action</a></li> @@ -81,7 +81,7 @@ <li role="presentation"><a role="menuitem" tabindex="-1" href="http://twitter.com/fat">Separated link</a></li> </ul> </li> - <li class="dropdown"> + <li role="presentation" class="dropdown"> <a id="drop6" role="button" data-toggle="dropdown" href="#">Dropdown 3</a> <ul id="menu3" class="dropdown-menu" role="menu" aria-labelledby="drop6"> <li role="presentation"><a role="menuitem" tabindex="-1" href="http://twitter.com/fat">Action</a></li> |