diff options
| author | Mark Otto <[email protected]> | 2013-12-08 23:56:22 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-08 23:56:22 -0800 |
| commit | de218bbba83b83f96f62b689a56b18b3ebcd191e (patch) | |
| tree | 5eb4c58adec10c3bb98cc6d306e80887b7f2e6d3 /Gruntfile.js | |
| parent | ea61a19a04e3bcd96f1dc0960375d926bb1dabb5 (diff) | |
| parent | cbfbf1b2dd16b1aa17e3feef9a4643e98a0f967e (diff) | |
| download | bootstrap-de218bbba83b83f96f62b689a56b18b3ebcd191e.tar.xz bootstrap-de218bbba83b83f96f62b689a56b18b3ebcd191e.zip | |
Merge branch 'pr/11779' into drop_recess_for_less
Conflicts:
Gruntfile.js
package.json
Diffstat (limited to 'Gruntfile.js')
| -rw-r--r-- | Gruntfile.js | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 35ad76394..36112c840 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -58,6 +58,13 @@ module.exports = function (grunt) { } }, + csslint: { + options: { + csslintrc: '.csslintrc' + }, + src: ['dist/css/bootstrap.css', 'dist/css/bootstrap-theme.css'] + }, + concat: { options: { banner: '<%= banner %><%= jqueryCheck %>', @@ -322,6 +329,7 @@ module.exports = function (grunt) { grunt.loadNpmTasks('grunt-contrib-concat'); grunt.loadNpmTasks('grunt-contrib-connect'); grunt.loadNpmTasks('grunt-contrib-copy'); + grunt.loadNpmTasks('grunt-contrib-csslint'); grunt.loadNpmTasks('grunt-contrib-cssmin'); grunt.loadNpmTasks('grunt-contrib-jshint'); grunt.loadNpmTasks('grunt-contrib-less'); |