diff options
| author | Mark Otto <[email protected]> | 2013-07-26 13:51:27 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-26 13:51:27 -0700 |
| commit | 1ad3e1e8a79608cab9466a73f3d86b1c4787ae2f (patch) | |
| tree | c3a9aa6e810e30a3667398f60c71302534895571 | |
| parent | ded4ebfa7eb2dc10f2ec784732158c1e125d15f2 (diff) | |
| parent | cd23ae00ddfb7246ba56000a2ec6f83f9c82554f (diff) | |
| download | bootstrap-1ad3e1e8a79608cab9466a73f3d86b1c4787ae2f.tar.xz bootstrap-1ad3e1e8a79608cab9466a73f3d86b1c4787ae2f.zip | |
Merge branch '3.0.0-wip' of https://github.com/jojohess/bootstrap into jojohess-3.0.0-wip
| -rw-r--r-- | README.md | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -31,7 +31,7 @@ Bootstrap's documentation, included in this repo in the root directory, is built ### Running documentation locally 1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v1.x). -2. From the `/bootstrap` directory, run `jekyll serve` in the command line. +2. From the `/bootstrap` directory, run `jekyll serve` in the command line. (on Windows, run `chcp 65001` before `jekyll serve`) 3. Open [http://localhost:9001](http://localhost:9001) in your browser, and voilà. Learn more about using Jekyll by reading their [documentation](http://jekyllrb.com/docs/home/). @@ -64,8 +64,8 @@ When completed, you'll be able to run the various grunt commands provided. #### Build - `grunt` `grunt` runs the Recess compiler to rebuild the `/less` files and compile the docs. **Requires recess and uglify-js.** -#### Compile CSS, and JavaScript - `grunt bootstrap` -`grunt bootstrap` creates the `/bootstrap` directory with compiled files. **Requires recess and uglify-js.** +#### Compile CSS, and JavaScript - `grunt dist` +`grunt dist` creates the `/dist` directory with compiled files. **Requires recess and uglify-js.** #### Tests - `grunt test` Runs jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/phantomjs/) (used for ci). **Requires phantomjs.** |