diff options
author | Maximilian Hils <git@maximilianhils.com> | 2016-04-13 20:37:22 -0700 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2016-04-13 20:37:22 -0700 |
commit | 03c011cf4b1cad376529c0a64c912677fb93e93e (patch) | |
tree | 2573b5be4fae0e50e4d76b85e6fee51343fda73b | |
parent | 1ab51a1d3d5627ecc8da04b9d7efd2dd64585525 (diff) | |
parent | 96782407833a7f827e79fa7aa5f2576f1bee3547 (diff) | |
download | mitmproxy-03c011cf4b1cad376529c0a64c912677fb93e93e.tar.gz mitmproxy-03c011cf4b1cad376529c0a64c912677fb93e93e.tar.bz2 mitmproxy-03c011cf4b1cad376529c0a64c912677fb93e93e.zip |
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
-rw-r--r-- | web/gulpfile.js | 4 | ||||
-rw-r--r-- | web/package.json | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/web/gulpfile.js b/web/gulpfile.js index 3c2e3f15..ffa5387a 100644 --- a/web/gulpfile.js +++ b/web/gulpfile.js @@ -10,7 +10,7 @@ var gulp = require("gulp"); var eslint = require('gulp-eslint'); var less = require("gulp-less"); var livereload = require("gulp-livereload"); -var minifyCSS = require('gulp-minify-css'); +var cleanCSS = require('gulp-clean-css'); var notify = require("gulp-notify"); var peg = require("gulp-peg"); var plumber = require("gulp-plumber"); @@ -68,7 +68,7 @@ function styles(files, dev){ .pipe(dev ? plumber(handleError) : gutil.noop()) .pipe(sourcemaps.init()) .pipe(less()) - .pipe(dev ? gutil.noop() : minifyCSS()) + .pipe(dev ? gutil.noop() : cleanCSS()) .pipe(sourcemaps.write(".", {sourceRoot: fixLessSourceMaps})) .pipe(gulp.dest(conf.static)) .pipe(livereload({auto: false})); diff --git a/web/package.json b/web/package.json index e489a0b1..fb3da81b 100644 --- a/web/package.json +++ b/web/package.json @@ -37,10 +37,10 @@ "browserify": "^13.0.0", "eslint": "^2.2.0", "gulp": "^3.9.1", + "gulp-clean-css": "^2.0.6", "gulp-eslint": "^2.0.0", "gulp-less": "^3.0.5", "gulp-livereload": "^3.8.1", - "gulp-minify-css": "^1.2.4", "gulp-notify": "^2.2.0", "gulp-peg": "^0.2.0", "gulp-plumber": "^1.1.0", |