diff options
| author | Mark Otto <[email protected]> | 2013-12-22 21:01:00 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-22 21:01:00 -0800 |
| commit | 7ccb0333e488a74b7ffc40f9ed6fda379e50af37 (patch) | |
| tree | fdc66d79e929272533779887feb2dcd9d02cbc5a | |
| parent | 51628d20506ea34b353d52fa2edfc22e6b814367 (diff) | |
| parent | 146800ef432d92837abf181ab78cbd12c6aff583 (diff) | |
| download | bootstrap-7ccb0333e488a74b7ffc40f9ed6fda379e50af37.tar.xz bootstrap-7ccb0333e488a74b7ffc40f9ed6fda379e50af37.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | package.json | 14 |
2 files changed, 9 insertions, 9 deletions
@@ -97,10 +97,10 @@ When completed, you'll be able to run the various Grunt commands provided from t ### Available Grunt commands #### Build - `grunt` -Run `grunt` to run tests locally and compile the CSS and JavaScript into `/dist`. **Uses [recess](http://twitter.github.io/recess/) and [UglifyJS](http://lisperator.net/uglifyjs/).** +Run `grunt` to run tests locally and compile the CSS and JavaScript into `/dist`. **Uses [Less](http://lesscss.org/) and [UglifyJS](http://lisperator.net/uglifyjs/).** #### Only compile CSS and JavaScript - `grunt dist` -`grunt dist` creates the `/dist` directory with compiled files. **Uses [recess](http://twitter.github.io/recess/) and [UglifyJS](http://lisperator.net/uglifyjs/).** +`grunt dist` creates the `/dist` directory with compiled files. **Uses [Less](http://lesscss.org/) and [UglifyJS](http://lisperator.net/uglifyjs/).** #### Tests - `grunt test` Runs [JSHint](http://jshint.com) and [QUnit](http://qunitjs.com/) tests headlessly in [PhantomJS](http://phantomjs.org/) (used for CI). diff --git a/package.json b/package.json index 882025622..9d00cc318 100644 --- a/package.json +++ b/package.json @@ -21,25 +21,25 @@ ], "devDependencies": { "btoa": "~1.1.1", - "grunt": "~0.4.1", + "grunt": "~0.4.2", "grunt-banner": "~0.2.0", "grunt-contrib-clean": "~0.5.0", "grunt-contrib-concat": "~0.3.0", "grunt-contrib-connect": "~0.5.0", "grunt-contrib-copy": "~0.4.1", "grunt-contrib-csslint": "~0.2.0", - "grunt-contrib-jshint": "~0.7.0", - "grunt-contrib-less": "~0.8.0", + "grunt-contrib-jshint": "~0.7.2", + "grunt-contrib-less": "~0.8.3", "grunt-contrib-qunit": "~0.3.0", - "grunt-contrib-uglify": "~0.2.4", + "grunt-contrib-uglify": "~0.2.7", "grunt-contrib-watch": "~0.5.3", "grunt-csscomb": "~1.2.1", - "grunt-html-validation": "~0.1.11", + "grunt-html-validation": "~0.1.12", "grunt-jekyll": "~0.4.0", - "grunt-jscs-checker": "~0.2.5", + "grunt-jscs-checker": "~0.2.6", "grunt-saucelabs": "~4.1.2", "grunt-sed": "~0.1.1", - "load-grunt-tasks": "~0.2.0" + "load-grunt-tasks": "~0.2.1" }, "jspm": { "main": "js/bootstrap", |