diff options
| author | Mark Otto <[email protected]> | 2013-07-17 20:44:27 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-17 20:44:27 -0700 |
| commit | f0d071832284d968f2cb72b0bb576f8112a349de (patch) | |
| tree | 9766c8da2b7c6890cdc794a2d93d4ca81c191047 /docs/_includes/nav-components.html | |
| parent | c5fb401a626c3e0d99a764cb7961e1bd3e619e8f (diff) | |
| parent | bfebf0e490c795601220f74b7089adb4f47acda7 (diff) | |
| download | bootstrap-f0d071832284d968f2cb72b0bb576f8112a349de.tar.xz bootstrap-f0d071832284d968f2cb72b0bb576f8112a349de.zip | |
Merge branch '3.0.0-wip' into bs3_remove_examples
Conflicts:
docs/_includes/nav-getting-started.html
docs/examples/navbar-fixed-top.html
docs/examples/navbar-static-top.html
docs/examples/navbar.html
docs/getting-started.html
Diffstat (limited to 'docs/_includes/nav-components.html')
| -rw-r--r-- | docs/_includes/nav-components.html | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/docs/_includes/nav-components.html b/docs/_includes/nav-components.html index 4f49d68b2..ed00b62fa 100644 --- a/docs/_includes/nav-components.html +++ b/docs/_includes/nav-components.html @@ -1,18 +1,9 @@ <li> - <a href="#icons">Glyphicons</a> - <ul class="nav"> - <li><a href="#icons-list">Icon list</a></li> - <li><a href="#icons-how-to">How to use</a></li> - <li><a href="#icons-examples">Examples</a></li> - </ul> -</li> -<li> <a href="#dropdowns">Dropdowns</a> <ul class="nav"> <li><a href="#dropdowns-example">Example</a></li> <li><a href="#dropdowns-alignment">Alignment options</a></li> <li><a href="#dropdowns-disabled">Disabled menu items</a></li> - <li><a href="#dropdowns-submenus">Submenus</a></li> </ul> </li> <li> @@ -102,9 +93,7 @@ <a href="#list-group">List group</a> <ul class="nav"> <li><a href="#list-group-basic">Basic list group</a></li> - <li><a href="#list-group-chevrons">Chevrons</a></li> <li><a href="#list-group-badges">Badges</a></li> - <li><a href="#list-group-badges-chevrons">Badges and chevrons</a></li> <li><a href="#list-group-linked">Linked items</a></li> <li><a href="#list-group-custom-content">Custom content</a></li> <!-- <li><a href="#list-group-pic">Leading picture</a></li> --> |