diff options
| author | Mark Otto <[email protected]> | 2014-07-07 22:10:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-07 22:10:22 -0700 |
| commit | 81b59d35368bc51d361d0352cc92fe99dc580fbf (patch) | |
| tree | 2395d5e79edaaa8c0a7ad82e99931ec895421532 /docs/_includes/nav/getting-started.html | |
| parent | fed2b0f7eb78438eb1b768782b04651881d88740 (diff) | |
| parent | ddee04038f946ac103eb4e70c8eb7adeb2cf563b (diff) | |
| download | bootstrap-81b59d35368bc51d361d0352cc92fe99dc580fbf.tar.xz bootstrap-81b59d35368bc51d361d0352cc92fe99dc580fbf.zip | |
Merge branch 'master' into derp
Conflicts:
docs/_layouts/default.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/docs.min.js
docs/assets/js/src/application.js
Diffstat (limited to 'docs/_includes/nav/getting-started.html')
| -rw-r--r-- | docs/_includes/nav/getting-started.html | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/docs/_includes/nav/getting-started.html b/docs/_includes/nav/getting-started.html index e253bf1c1..54927c22a 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> @@ -36,6 +44,7 @@ <li><a href="#support-ie8-ie9">Internet Explorer 8-9</a></li> <li><a href="#support-ie8-respondjs">IE8 and Respond.js</a></li> <li><a href="#support-ie8-box-sizing">IE8 and box-sizing</a></li> + <li><a href="#support-ie8-font-face">IE8 and @font-face</a></li> <li><a href="#support-ie-compatibility-modes">IE Compatibility modes</a></li> <li><a href="#support-ie10-width">IE10 and Windows (Phone) 8</a></li> <li><a href="#support-safari-percentages">Safari percent rounding</a></li> |