diff options
| author | Mark Otto <[email protected]> | 2014-05-20 23:27:40 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-05-20 23:27:40 -0700 |
| commit | 707b362b801d7a430c1911493a65085e81b4ee8d (patch) | |
| tree | b659b23c3884e9100c1e800161e96110a0853294 /docs/_includes/nav | |
| parent | bdd822a94cdf2d452e067569e76ca1537dc74d8d (diff) | |
| parent | 3dd1531d81c90d6d1cf04962032f868d315ab21c (diff) | |
| download | bootstrap-707b362b801d7a430c1911493a65085e81b4ee8d.tar.xz bootstrap-707b362b801d7a430c1911493a65085e81b4ee8d.zip | |
Merge branch 'master' into docs-theme-toggler
Conflicts:
docs/assets/css/docs.min.css
Diffstat (limited to 'docs/_includes/nav')
| -rw-r--r-- | docs/_includes/nav/css.html | 7 | ||||
| -rw-r--r-- | docs/_includes/nav/getting-started.html | 15 |
2 files changed, 8 insertions, 14 deletions
diff --git a/docs/_includes/nav/css.html b/docs/_includes/nav/css.html index f2b1b5420..5a8d86368 100644 --- a/docs/_includes/nav/css.html +++ b/docs/_includes/nav/css.html @@ -133,10 +133,3 @@ <li><a href="#sass-installation">Rails install</a></li> </ul> </li> -<li> - <a href="#rtl">RTL version</a> - <ul class="nav"> - <li><a href="#rtl-how-to">How to use</a></li> - <li><a href="#rtl-css-flip">CSS Flip</a></li> - </ul> -</li> diff --git a/docs/_includes/nav/getting-started.html b/docs/_includes/nav/getting-started.html index 494a2950f..fae906920 100644 --- a/docs/_includes/nav/getting-started.html +++ b/docs/_includes/nav/getting-started.html @@ -9,6 +9,14 @@ </ul> </li> <li> + <a href="#grunt">Compiling CSS and JavaScript</a> + <ul class="nav"> + <li><a href="#grunt-installing">Installing Grunt</a></li> + <li><a href="#grunt-commands">Available Grunt commands</a></li> + <li><a href="#grunt-troubleshooting">Troubleshooting</a></li> + </ul> +</li> +<li> <a href="#template">Basic template</a> </li> <li> @@ -21,13 +29,6 @@ </ul> </li> <li> - <a href="#rtl">RTL version</a> - <ul class="nav"> - <li><a href="#rtl-how-to">How to use</a></li> - <li><a href="#rtl-css-flip">CSS Flip</a></li> - </ul> -</li> -<li> <a href="#community">Community</a> </li> <li> |