From dcd6c5fd5a9138d0c0c1cbbc63fe7611f44c791a Mon Sep 17 00:00:00 2001 From: Benoit Favreault Date: Thu, 19 Feb 2015 15:23:42 -0500 Subject: [PATCH] Add autoprefixer and its dependancies (fix the buggy flex boxes in Safari and some older browsers) --- UI/WebServerResources/Gruntfile.js | 19 ++++++++++++++++--- UI/WebServerResources/package.json | 19 ++++++++++--------- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/UI/WebServerResources/Gruntfile.js b/UI/WebServerResources/Gruntfile.js index b7d919749..6c93364ad 100644 --- a/UI/WebServerResources/Gruntfile.js +++ b/UI/WebServerResources/Gruntfile.js @@ -13,7 +13,19 @@ module.exports = function(grunt) { } } }, - + postcss: { + options: { + map: false, + processors: [ + require('autoprefixer-core')({browsers: '> 1%, last 2 versions, last 3 Firefox versions'}).postcss + // We may consider using css grace (https://github.com/cssdream/cssgrace) for larger support + //require('csswring').postcss + ] + }, + dist: { + src: 'css/styles.css' + } + }, watch: { grunt: { files: ['Gruntfile.js'] }, @@ -25,6 +37,7 @@ module.exports = function(grunt) { }); grunt.loadNpmTasks('grunt-contrib-sass'); + grunt.loadNpmTasks('grunt-postcss'); grunt.loadNpmTasks('grunt-contrib-watch'); grunt.task.registerTask('static', function() { @@ -79,7 +92,7 @@ module.exports = function(grunt) { } grunt.log.subhead('Copying CSS files'); var css = [ - '<%= src %>/ng-tags-input/ng-tags-input*.css' + '<%= src %>/ng-tags-input/ng-tags-input*.css' // This is no longer needed, ng-tags css is integrated to scss ]; for (var j = 0; j < css.length; j++) { var files = grunt.file.expand(grunt.template.process(css[j], {data: options})); @@ -94,4 +107,4 @@ module.exports = function(grunt) { }); grunt.task.registerTask('build', ['static', 'sass']); grunt.task.registerTask('default', ['build','watch']); -} +}; diff --git a/UI/WebServerResources/package.json b/UI/WebServerResources/package.json index 49696207f..a2b523988 100644 --- a/UI/WebServerResources/package.json +++ b/UI/WebServerResources/package.json @@ -1,11 +1,12 @@ { - "name": "sogo-web", - "version": "0.0.1", - "devDependencies": { - "bower": ">=1.3.8", - "grunt": ">=0.4.1", - "grunt-cli": ">=0.1.11", - "grunt-contrib-watch": ">=0.5.3", - "grunt-contrib-sass": ">=0.8.0" - } + "name": "sogo-web", + "version": "0.0.1", + "devDependencies": { + "bower": ">=1.3.8", + "grunt": ">=0.4.1", + "grunt-cli": ">=0.1.11", + "grunt-contrib-sass": ">=0.8.0", + "grunt-contrib-watch": ">=0.5.3", + "grunt-postcss": "^0.3.0" + } }