diff options
| author | Mark Otto <[email protected]> | 2013-08-18 10:35:26 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 10:35:26 -0700 |
| commit | d7eee9bd6ecbe4724ef0f9644edb92a9ede91bee (patch) | |
| tree | 19e1986b74067d660021f24c0c4e7c32effc06f6 /_includes | |
| parent | 92d89895530818e4011156c16eac2112f8bbaf89 (diff) | |
| parent | f8b65b41ab0c1bc130c3ca521fb99214f5509568 (diff) | |
| download | bootstrap-d7eee9bd6ecbe4724ef0f9644edb92a9ede91bee.tar.xz bootstrap-d7eee9bd6ecbe4724ef0f9644edb92a9ede91bee.zip | |
Merge pull request #9767 from twbs/bs3_restore_glyphicons
BS3: Restore Glyphicons
Diffstat (limited to '_includes')
| -rw-r--r-- | _includes/nav-components.html | 8 | ||||
| -rw-r--r-- | _includes/nav-css.html | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/_includes/nav-components.html b/_includes/nav-components.html index c5ced697d..b251cc332 100644 --- a/_includes/nav-components.html +++ b/_includes/nav-components.html @@ -1,4 +1,12 @@ <li> + <a href="#glyphicons">Glyphicons</a> + <ul class="nav"> + <li><a href="#glyphicons-glyphs">Available glyphs</a></li> + <li><a href="#glyphicons-how-to-use">How ot use</a></li> + <li><a href="#glyphicons-examples">Examples</a></li> + </ul> +</li> +<li> <a href="#dropdowns">Dropdowns</a> <ul class="nav"> <li><a href="#dropdowns-example">Example</a></li> diff --git a/_includes/nav-css.html b/_includes/nav-css.html index 4d2d58da3..31ba46403 100644 --- a/_includes/nav-css.html +++ b/_includes/nav-css.html @@ -10,9 +10,6 @@ </ul> </li> <li> - <a href="#glyphicons">Glyphicons</a> -</li> -<li> <a href="#grid">Grid system</a> <ul class="nav"> <li><a href="#grid-media-queries">Media queries</a></li> |