aboutsummaryrefslogtreecommitdiffstats
path: root/web/gulpfile.js
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-09-17 23:59:39 +0200
committerMaximilian Hils <git@maximilianhils.com>2014-09-17 23:59:39 +0200
commitb99de36b24e4687e35069fbfa18727519f23ea35 (patch)
treef70d491c39669cbf4e91a653026cf17aa2822b33 /web/gulpfile.js
parent4ca720b55680e40b3a4361141a2ad39f9de81111 (diff)
downloadmitmproxy-b99de36b24e4687e35069fbfa18727519f23ea35.tar.gz
mitmproxy-b99de36b24e4687e35069fbfa18727519f23ea35.tar.bz2
mitmproxy-b99de36b24e4687e35069fbfa18727519f23ea35.zip
undo spriting
Diffstat (limited to 'web/gulpfile.js')
-rw-r--r--web/gulpfile.js24
1 files changed, 6 insertions, 18 deletions
diff --git a/web/gulpfile.js b/web/gulpfile.js
index c1ca8e67..66554051 100644
--- a/web/gulpfile.js
+++ b/web/gulpfile.js
@@ -12,7 +12,6 @@ var qunit = require("gulp-qunit");
var react = require("gulp-react");
var rename = require("gulp-rename");
var sourcemaps = require('gulp-sourcemaps');
-var sprite = require('gulp-sprite-generator');
var uglify = require('gulp-uglify');
@@ -52,8 +51,7 @@ var path = {
},
css: {
vendor: ["css/vendor.less"],
- app: ["css/app.less"],
- spritefile: "css/sprites.less"
+ app: ["css/app.less"]
},
fonts: ["src/vendor/fontawesome/fontawesome-webfont.*"],
html: ["src/*.html", "!src/benchmark.html", "!src/test.html"],
@@ -131,20 +129,10 @@ gulp.task("jshint", function () {
.pipe(jshint.reporter("jshint-stylish"));
});
-gulp.task("sprites", function () {
- // Sprite generator is a gulp task, which accepts options object and
- // returns two streams for style and image piping.
- var spriteOutput = gulp.src([path.css.spritefile], {base: "src", cwd: "src"})
- .pipe(sprite({
- spriteSheetName: "sprite.png",
- spriteSheetPath: "../images",
- }));
- var css = spriteOutput.css
- .pipe(rename({extname:".compiled.less"}))
- .pipe(gulp.dest("src/css"));
- var img = spriteOutput.img.pipe(gulp.dest(path.dist + "static/images"));
- // https://github.com/gulpjs/gulp/blob/master/docs/recipes/using-multiple-sources-in-one-task.md
- return merge(css, img);
+gulp.task("images", function () {
+ //(spriting code in commit 4ca720b55680e40b3a4361141a2ad39f9de81111)
+ return gulp.src(["src/images/**"])
+ .pipe(gulp.dest(path.dist + "static/images"));
});
gulp.task("html", function () {
@@ -160,7 +148,7 @@ gulp.task('test', function() {
});
-common = ["fonts", "html", "jshint", "sprites"];
+common = ["fonts", "html", "jshint", "images"];
gulp.task("dev", common.concat(["styles-dev", "scripts-dev"]));
gulp.task("prod", common.concat(["styles-prod", "scripts-prod"]));