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-css.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-css.html')
| -rw-r--r-- | docs/_includes/nav-css.html | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/_includes/nav-css.html b/docs/_includes/nav-css.html index 534c9c2ed..fb00465c2 100644 --- a/docs/_includes/nav-css.html +++ b/docs/_includes/nav-css.html @@ -10,6 +10,9 @@ </ul> </li> <li> + <a href="#glyphicons">Glyphicons</a> +</li> +<li> <a href="#grid">Grid system</a> <ul class="nav"> <li><a href="#grid-options">Available options</a></li> @@ -19,7 +22,6 @@ <li><a href="#grid-offsetting">Offset columns</a></li> <li><a href="#grid-nesting">Nested columns</a></li> <li><a href="#grid-column-ordering">Column ordering</a></li> - <li><a href="#grid-small">Small device grid</a></li> <li><a href="#grid-less">LESS mixins and variables</a></li> </ul> </li> |