diff options
| author | David Baughman <[email protected]> | 2015-08-27 13:41:24 -0700 |
|---|---|---|
| committer | David Baughman <[email protected]> | 2015-08-27 13:41:24 -0700 |
| commit | e481c8fff268a1cce1fe0d60dc85d4f6b85e855e (patch) | |
| tree | 361d07f1cbe685332826d6cb6b291243a939df30 /docs/getting-started | |
| parent | 026682bf0dc828d8d689cb01e623eb311de0c013 (diff) | |
| parent | 232469549c9a9b6082b311f568556d99ea03af2f (diff) | |
| download | bootstrap-e481c8fff268a1cce1fe0d60dc85d4f6b85e855e.tar.xz bootstrap-e481c8fff268a1cce1fe0d60dc85d4f6b85e855e.zip | |
Merge branch 'v4-dev' into v4-media-breakpoint-between
Diffstat (limited to 'docs/getting-started')
| -rw-r--r-- | docs/getting-started/build-tools.md | 2 | ||||
| -rw-r--r-- | docs/getting-started/download.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/getting-started/build-tools.md b/docs/getting-started/build-tools.md index 04cf5b7a0..adda6cbb1 100644 --- a/docs/getting-started/build-tools.md +++ b/docs/getting-started/build-tools.md @@ -28,7 +28,7 @@ Our Gruntfile includes the following commands and tasks: | --- | --- | | `grunt` | Run `grunt` to run tests locally and compile the CSS and JavaScript into `/dist`. **Uses [Sass](http://sass-lang.com/) and [UglifyJS](http://lisperator.net/uglifyjs/).** | | `grunt dist` | `grunt dist` creates the `/dist` directory with compiled files. **Uses [Sass](http://sass-lang.com/) and [UglifyJS](http://lisperator.net/uglifyjs/).** | -| `grunt test` | Runs [JSHint](http://jshint.com) and [QUnit](http://qunitjs.com/) tests headlessly in [PhantomJS](http://phantomjs.org/) (used for CI). | +| `grunt test` | Runs [scss-lint](https://github.com/brigade/scss-lint), [ESLint](http://eslint.org/) and [QUnit](http://qunitjs.com/) tests headlessly in [PhantomJS](http://phantomjs.org/) (used for CI). | | `grunt docs` | Builds and tests CSS, JavaScript, and other assets which are used when running the documentation locally via `jekyll serve`. | | `grunt watch` | This is a convenience method for watching just Sass files and automatically building them whenever you save. | diff --git a/docs/getting-started/download.md b/docs/getting-started/download.md index 7255fbba5..aa9834e47 100644 --- a/docs/getting-started/download.md +++ b/docs/getting-started/download.md @@ -52,7 +52,7 @@ Install Bootstrap in your Node powered apps with [the npm package](https://www.n Bootstrap's `package.json` contains some additional metadata under the following keys: -- `less` - path to Bootstrap's main [Less](http://lesscss.org) source file +- `sass` - path to Bootstrap's main [Sass](http://sass-lang.com/) source file - `style` - path to Bootstrap's non-minified CSS that's been precompiled using the default settings (no customization) ### Meteor |