Skip to content

Commit

Permalink
Splitted Strombringer styles in two files
Browse files Browse the repository at this point in the history
  • Loading branch information
nicomollet committed Jul 28, 2014
1 parent 2c413db commit 28e7c73
Showing 1 changed file with 7 additions and 15 deletions.
22 changes: 7 additions & 15 deletions GruntFile.js → Gruntfile2.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module.exports = function(grunt) {
'js/bootstrap-modalopen.js', // Bootstrap Modal
'js/app.js', // Custom JS
],
dest: 'assets/javascripts/production.js',
dest: 'js/production.js',
}
},

Expand Down Expand Up @@ -46,28 +46,22 @@ module.exports = function(grunt) {
}
},

shell: {
grunt: {
command: 'afplay ~/Music/Grunt.aiff'
}
},

watch: {
options: {
livereload: true,
livereload : 8080,
},

scripts: {
files: ['assets/javascripts/*.js'],
tasks: ['concat', 'uglify', 'shell:grunt'],
files: ['js/*.js'],
tasks: ['concat', 'uglify'],
options: {
spawn: false,
},
},

css: {
files: ['assets/stylesheets/*.scss'],
tasks: ['sass', 'cssmin', 'shell:grunt'],
files: ['scss/*.scss'],
tasks: ['sass', 'cssmin'],
options: {
spawn: false,
}
Expand All @@ -82,12 +76,10 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-sass');
grunt.loadNpmTasks('grunt-contrib-cssmin');
grunt.loadNpmTasks('grunt-autoprefixer');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-shell');


// 4. Where we tell Grunt what to do when we type "grunt" into the terminal.
grunt.registerTask('default', ['concat', 'uglify', 'sass', 'cssmin', 'autoprefixer', 'watch', 'shell']);
grunt.registerTask('default', ['concat', 'uglify', 'sass', 'cssmin', 'watch']);

};

0 comments on commit 28e7c73

Please sign in to comment.