0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00

Fix navs dropdown sections

This commit is contained in:
Mark Otto 2014-07-09 16:08:18 -07:00
parent 857fe32a70
commit 2846850117

View File

@ -173,12 +173,11 @@
<h3>Tabs with dropdowns</h3> <h3>Tabs with dropdowns</h3>
<div class="bs-example"> <div class="bs-example">
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs" role="tablist">
<li class="active"><a href="#">Home</a></li> <li class="nav-item active">
<li><a href="#">Help</a></li> <a href="#" class="nav-link">Active</a>
<li class="dropdown"> </li>
<a class="dropdown-toggle" data-toggle="dropdown" href="#"> <li class="nav-item">
Dropdown <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">Dropdown</a>
</a>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li><a href="#">Action</a></li> <li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li> <li><a href="#">Another action</a></li>
@ -187,13 +186,19 @@
<li><a href="#">Separated link</a></li> <li><a href="#">Separated link</a></li>
</ul> </ul>
</li> </li>
<li class="nav-item">
<a href="#" class="nav-link">Another link</a>
</li>
<li class="nav-item disabled">
<a href="#" class="nav-link">Disabled</a>
</li>
</ul> </ul>
</div> </div>
{% highlight html %} {% highlight html %}
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs" role="tablist">
... ...
<li class="dropdown"> <li class="nav-item">
<a class="dropdown-toggle" data-toggle="dropdown" href="#"> <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">
Dropdown Dropdown
</a> </a>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
@ -207,12 +212,11 @@
<h3>Pills with dropdowns</h3> <h3>Pills with dropdowns</h3>
<div class="bs-example"> <div class="bs-example">
<ul class="nav nav-pills" role="tablist"> <ul class="nav nav-pills" role="tablist">
<li class="active"><a href="#">Home</a></li> <li class="nav-item active">
<li><a href="#">Help</a></li> <a href="#" class="nav-link">Active</a>
<li class="dropdown"> </li>
<a class="dropdown-toggle" data-toggle="dropdown" href="#"> <li class="nav-item">
Dropdown <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">Dropdown</a>
</a>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li><a href="#">Action</a></li> <li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li> <li><a href="#">Another action</a></li>
@ -221,13 +225,19 @@
<li><a href="#">Separated link</a></li> <li><a href="#">Separated link</a></li>
</ul> </ul>
</li> </li>
<li class="nav-item">
<a href="#" class="nav-link">Another link</a>
</li>
<li class="nav-item disabled">
<a href="#" class="nav-link">Disabled</a>
</li>
</ul> </ul>
</div><!-- /example --> </div>
{% highlight html %} {% highlight html %}
<ul class="nav nav-pills" role="tablist"> <ul class="nav nav-pills" role="tablist">
... ...
<li class="dropdown"> <li class="nav-item">
<a class="dropdown-toggle" data-toggle="dropdown" href="#"> <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">
Dropdown Dropdown
</a> </a>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">