diff options
| author | Mark Otto <[email protected]> | 2013-09-01 09:33:11 +0200 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-09-01 09:33:11 +0200 |
| commit | f29ec45715d33c7667682517bbab4ec285716bde (patch) | |
| tree | 67f82cc5df0578ed9685f876447b31776c9cea51 /_includes | |
| parent | 5491d53b99c3dfa54622ca0d0bba52206c883a14 (diff) | |
| parent | e47ebf3686440df07a83a9d2643b70087ec4fb81 (diff) | |
| download | bootstrap-f29ec45715d33c7667682517bbab4ec285716bde.tar.xz bootstrap-f29ec45715d33c7667682517bbab4ec285716bde.zip | |
Merge branch 'master' into deprecate_screen_containers
Diffstat (limited to '_includes')
| -rw-r--r-- | _includes/nav-components.html | 1 | ||||
| -rw-r--r-- | _includes/nav-css.html | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/_includes/nav-components.html b/_includes/nav-components.html index 8b239b226..7660a41db 100644 --- a/_includes/nav-components.html +++ b/_includes/nav-components.html @@ -61,6 +61,7 @@ <a href="#navbar">Navbar</a> <ul class="nav"> <li><a href="#navbar-default">Default navbar</a></li> + <li><a href="#navbar-forms">Forms</a></li> <li><a href="#navbar-buttons">Buttons</a></li> <li><a href="#navbar-text">Text</a></li> <li><a href="#navbar-links">Non-nav links</a></li> diff --git a/_includes/nav-css.html b/_includes/nav-css.html index 4d21a4f9f..7a6b459af 100644 --- a/_includes/nav-css.html +++ b/_includes/nav-css.html @@ -80,6 +80,7 @@ <li><a href="#helper-classes-close">Close icon</a></li> <li><a href="#helper-classes-floats">Quick floats</a></li> <li><a href="#helper-classes-clearfix">Clearfix</a></li> + <li><a href="#helper-classes-show-hide">Showing and hiding content</a></li> <li><a href="#helper-classes-screen-readers">Screen reader content</a></li> <li><a href="#helper-classes-image-replacement">Image replacement</a></li> </ul> |