diff options
| author | Mark Otto <[email protected]> | 2013-08-17 16:10:35 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-17 16:10:35 -0700 |
| commit | 0b96015dc960d842ddedc8f5343b61ca29f3d4af (patch) | |
| tree | 7ab3d017e1457a0378a6a5c805cbb2564f273af3 /javascript.html | |
| parent | c8b51e1cd8c3e14abbd7e8301a13c82238994cc7 (diff) | |
| parent | d754e6564d8fd8fe1447ba6674eb9e041a6190b2 (diff) | |
| download | bootstrap-0b96015dc960d842ddedc8f5343b61ca29f3d4af.tar.xz bootstrap-0b96015dc960d842ddedc8f5343b61ca29f3d4af.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Diffstat (limited to 'javascript.html')
| -rw-r--r-- | javascript.html | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/javascript.html b/javascript.html index d229cc1d2..1d4604afc 100644 --- a/javascript.html +++ b/javascript.html @@ -541,12 +541,12 @@ $('#myDropdown').on('show.bs.dropdown', function () { <li><a href="#fat">@fat</a></li> <li><a href="#mdo">@mdo</a></li> <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="#one">one</a></li> - <li><a href="#two">two</a></li> + <a href="#" id="navbarDrop1" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a> + <ul class="dropdown-menu" role="menu" aria-labelledby="navbarDrop1"> + <li><a href="#one" tabindex="-1">one</a></li> + <li><a href="#two" tabindex="-1">two</a></li> <li class="divider"></li> - <li><a href="#three">three</a></li> + <li><a href="#three" tabindex="-1">three</a></li> </ul> </li> </ul> @@ -663,10 +663,10 @@ $('#myScrollspy').on('activate.bs.scrollspy', function () { <li class="active"><a href="#home" data-toggle="tab">Home</a></li> <li><a href="#profile" data-toggle="tab">Profile</a></li> <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="#dropdown1" data-toggle="tab">@fat</a></li> - <li><a href="#dropdown2" data-toggle="tab">@mdo</a></li> + <a href="#" id="myTabDrop1" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a> + <ul class="dropdown-menu" role="menu" aria-labelledby="myTabDrop1"> + <li><a href="#dropdown1" tabindex="-1" data-toggle="tab">@fat</a></li> + <li><a href="#dropdown2" tabindex="-1" data-toggle="tab">@mdo</a></li> </ul> </li> </ul> |