Merge remote-tracking branch 'upstream/master'

intersystems-community · Apr 25, 2015 · 0c0c08c · 0c0c08c
2 parents 8e21625 + 40f1856
commit 0c0c08c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -10,6 +10,8 @@ var gulp = require("gulp"),
     htmlReplace = require("gulp-html-replace"),
     header = require("gulp-header"),
     replace = require("gulp-replace"),
+    postcss = require('gulp-postcss'),
+    autoprefixer = require('autoprefixer-core'),
     pkg = require("./package.json"),
     zip = require("gulp-zip"),
     rename = require("gulp-rename");
@@ -72,6 +74,7 @@ gulp.task("gatherScripts", ["clean", "gatherLibs"], function () {
 gulp.task("gatherCSS", ["clean"], function () {
     return gulp.src("web/css/*.css")
         .pipe(concat("CacheUMLExplorer.css"))
+        .pipe(postcss([ autoprefixer({ browsers: ["last 3 version"] }) ]))
         .pipe(minifyCSS({ keepSpecialComments: 0 }))
         .pipe(gulp.dest("build/web/css/"));
 });

diff --git a/package.json b/package.json
@@ -7,6 +7,7 @@
   },
   "dependencies": {},
   "devDependencies": {
+    "autoprefixer-core": "^5.1.11",
     "express": "^5.0.0-alpha.1",
     "gulp": "^3.8.11",
     "gulp-add-src": "^0.2.0",
@@ -15,6 +16,7 @@
     "gulp-header": "^1.2.2",
     "gulp-html-replace": "^1.4.1",
     "gulp-minify-css": "^0.3.11",
+    "gulp-postcss": "^5.1.3",
     "gulp-rename": "^1.2.0",
     "gulp-replace": "^0.5.0",
     "gulp-strip-comments": "^1.0.1",