mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-02 16:04:07 +03:00
Code Activity

Merge branch 'pr/11779' into drop_recess_for_less

Browse Source 
Conflicts:
	Gruntfile.js
	package.json
This commit is contained in:
Mark Otto
2013-12-08 23:56:22 -08:00
parent ea61a19a04 cbfbf1b2dd
commit de218bbba8
3 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gruntfile.js
+8
View File
@@ -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');