Merge remote-tracking branch 'origin/master'

templates/gulpfile.js.twig

 // Run with "--env production" to get production optimized output
 
 // Load plugins
-var gulp = require('gulp'),
+var autoprefixer = require('autoprefixer'),
+  gulp = require('gulp'),
   gulpif = require('gulp-if'),
+  postcss = require('gulp-postcss'),
   sass = require('gulp-sass'),
   sourcemaps = require('gulp-sourcemaps'),
   notify = require('gulp-notify'),
@@ -58,11 +60,12 @@ gulp.task('css', function() {
         '{{ package.sass.relative }}',
 {% endif %}
 {% endfor %}
-  ]})
-  .on("error", notify.onError(function (error) {
-    return "Error: " + error.message;
-  })))
-  .pipe(gulpif(options.env !== 'production', sourcemaps.write('./maps')))
+      ]})
+      .on("error", notify.onError(function (error) {
+        return "Error: " + error.message;
+      })))
+    .pipe(postcss([autoprefixer()]))
+    .pipe(gulpif(options.env !== 'production', sourcemaps.write('./maps')))
     .pipe(gulp.dest(config.cssPath));
 });
 

templates/package.json

@@ -4,13 +4,19 @@
     "node": ">=4.2.0"
   },
   "dependencies": {
+    "autoprefixer": "^7.1.1",
     "gulp": "^3.9.0",
     "gulp-if": "^2.0.0",
     "gulp-notify": "^2.2.0",
+    "gulp-postcss": "^7.0.0",
     "gulp-sass": "^2.0.5",
     "gulp-sourcemaps": "^1.6.0",
     "minimist": "^1.2.0"
   },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions"
+  ],
   "scripts": {
     "postinstall": "find node_modules/ -name '*.info' -type f -delete"
   }

templates/sass/_settings.scss.twig

@@ -4,14 +4,14 @@
 // Set the directory for the Bootstrap Glyphicon font.
 $icon-font-path: '../fonts/bootstrap/';
 {% endif %}
-{% if bower_assets['flat-ui'] is defined %}
+{% if bower_assets['flat-ui-sass'] is defined %}
 
 // Workaround for Flat-UI issue with node-sass:
 // @see https://github.com/wingrunr21/flat-ui-sass/issues/39
 @function tint($color, $percentage){
   @return mix(#fff, $color, $percentage)
 }
-{% if bower_assets['flat-ui'].fonts is defined %}
+{% if bower_assets['flat-ui-sass'].fonts is defined %}
 // Set the directory for the Flat-UI Glyphicon font.
 $icon-font-path: '../fonts/flat-ui';
 $icon-font-name: 'flat-ui-icons-regular';