diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-10-06 14:24:42 +0200 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-10-06 14:24:42 +0200 |
| commit | 9694690a09012336d749d91e7b3d420ded68091f (patch) | |
| tree | 7a3d0c80099475c478a91c195667ba832ed2b4ac /js | |
| parent | eeec3b28186f7746a1057ccb615185f544c113f1 (diff) | |
also allow 7.0.3 alpha, minify css
Diffstat (limited to 'js')
| -rw-r--r-- | js/Gruntfile.js | 30 | ||||
| -rw-r--r-- | js/package.json | 1 |
2 files changed, 30 insertions, 1 deletions
diff --git a/js/Gruntfile.js b/js/Gruntfile.js index 79c119087..c3197b58d 100644 --- a/js/Gruntfile.js +++ b/js/Gruntfile.js @@ -16,6 +16,7 @@ module.exports = function (grunt) { grunt.loadNpmTasks('grunt-contrib-connect'); grunt.loadNpmTasks('grunt-contrib-jshint'); grunt.loadNpmTasks('grunt-contrib-uglify'); + grunt.loadNpmTasks('grunt-contrib-cssmin'); grunt.loadNpmTasks('grunt-phpunit'); grunt.loadNpmTasks('grunt-wrap'); grunt.loadNpmTasks('grunt-karma'); @@ -61,6 +62,31 @@ module.exports = function (grunt) { '<%= meta.production %>app.min.js': ['<%= meta.production %>app.js'] } + }, + options: { + } + }, + cssmin: { + newsBackport: { + files: {'../css/news-owncloud7.min.css': [ + '../css/7.css', + '../css/app.css', + '../css/content.css', + '../css/custom.css', + '../css/mobile.css', + '../css/navigation.css', + '../css/settings.css' + ]} + }, + news: { + files: {'../css/news.min.css': [ + '../css/app.css', + '../css/content.css', + '../css/custom.css', + '../css/mobile.css', + '../css/navigation.css', + '../css/settings.css' + ]} } }, wrap: { @@ -98,6 +124,8 @@ module.exports = function (grunt) { watch: { concat: { files: [ + '../css/*.css', + '!../css/*.min.css', 'tests/**/*.js', 'app/**/*.js', 'controller/**/*.js', @@ -163,7 +191,7 @@ module.exports = function (grunt) { // make tasks available under simpler commands grunt.registerTask('default', ['jshint', 'concat', 'wrap', 'ngAnnotate', - 'uglify']); + 'uglify', 'cssmin']); grunt.registerTask('dev', ['watch:concat']); grunt.registerTask('test', ['karma:unit']); grunt.registerTask('php', ['watch:phpunit']); diff --git a/js/package.json b/js/package.json index f4730c235..f17168bba 100644 --- a/js/package.json +++ b/js/package.json @@ -28,6 +28,7 @@ "grunt": "^0.4.5", "grunt-contrib-concat": "^0.5.0", "grunt-contrib-connect": "^0.8.0", + "grunt-contrib-cssmin": "^0.10.0", "grunt-contrib-jshint": "^0.10.0", "grunt-contrib-uglify": "^0.6.0", "grunt-contrib-watch": "^0.6.1", |