diff options
| author | Mark Otto <[email protected]> | 2014-10-25 18:44:55 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-10-25 18:44:55 -0700 |
| commit | e795ea1084acfdca87d7715a7b6010095be8a28b (patch) | |
| tree | 8969d9d949cf190db1b1d8e5cf48531b4100c885 /docs/_includes | |
| parent | 9bf9aab132698e34bc1eb5661563307fc4e86d02 (diff) | |
| download | bootstrap-e795ea1084acfdca87d7715a7b6010095be8a28b.tar.xz bootstrap-e795ea1084acfdca87d7715a7b6010095be8a28b.zip | |
Fixes #14791: document dropdown dividers
Diffstat (limited to 'docs/_includes')
| -rw-r--r-- | docs/_includes/components/dropdowns.html | 28 | ||||
| -rw-r--r-- | docs/_includes/nav/components.html | 1 |
2 files changed, 25 insertions, 4 deletions
diff --git a/docs/_includes/components/dropdowns.html b/docs/_includes/components/dropdowns.html index 4889c64f2..a88feafd2 100644 --- a/docs/_includes/components/dropdowns.html +++ b/docs/_includes/components/dropdowns.html @@ -15,7 +15,6 @@ <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Action</a></li> <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Another action</a></li> <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Something else here</a></li> - <li role="presentation" class="divider"></li> <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Separated link</a></li> </ul> </div> @@ -30,7 +29,6 @@ <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Action</a></li> <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Another action</a></li> <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Something else here</a></li> - <li role="presentation" class="divider"></li> <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Separated link</a></li> </ul> </div> @@ -65,7 +63,6 @@ <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Action</a></li> <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Another action</a></li> <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Something else here</a></li> - <li role="presentation" class="divider"></li> <li role="presentation" class="dropdown-header">Dropdown header</li> <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Separated link</a></li> </ul> @@ -73,10 +70,33 @@ </div><!-- /example --> {% highlight html %} <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu2"> + ... <li role="presentation" class="dropdown-header">Dropdown header</li> ... +</ul> +{% endhighlight %} + + <h3 id="dropdowns-divider">Divider</h3> + <p>Add a divider to separate series of links in a dropdown menu.</p> + <div class="bs-example"> + <div class="dropdown clearfix"> + <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown"> + Dropdown + <span class="caret"></span> + </button> + <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu2"> + <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Action</a></li> + <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Another action</a></li> + <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Something else here</a></li> + <li role="presentation" class="divider"></li> + <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Separated link</a></li> + </ul> + </div> + </div><!-- /example --> +{% highlight html %} +<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu2"> + ... <li role="presentation" class="divider"></li> - <li role="presentation" class="dropdown-header">Dropdown header</li> ... </ul> {% endhighlight %} diff --git a/docs/_includes/nav/components.html b/docs/_includes/nav/components.html index ebc0c904f..bf52d0e59 100644 --- a/docs/_includes/nav/components.html +++ b/docs/_includes/nav/components.html @@ -12,6 +12,7 @@ <li><a href="#dropdowns-example">Example</a></li> <li><a href="#dropdowns-alignment">Alignment options</a></li> <li><a href="#dropdowns-headers">Headers</a></li> + <li><a href="#dropdowns-divider">Divider</a></li> <li><a href="#dropdowns-disabled">Disabled menu items</a></li> </ul> </li> |