diff options
Diffstat (limited to 'web')
| -rw-r--r-- | web/gulpfile.js | 24 | ||||
| -rw-r--r-- | web/package.json | 1 | ||||
| -rw-r--r-- | web/src/css/app.less | 2 | ||||
| -rw-r--r-- | web/src/css/flowtable.less | 9 | ||||
| -rw-r--r-- | web/src/css/sprites.compiled.less | 58 |
5 files changed, 16 insertions, 78 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"])); diff --git a/web/package.json b/web/package.json index de90587f..932c3270 100644 --- a/web/package.json +++ b/web/package.json @@ -17,7 +17,6 @@ "gulp-react": "^1.0.1", "gulp-rename": "^1.2.0", "gulp-sourcemaps": "^1.1.5", - "gulp-sprite-generator": "^0.2.0", "gulp-uglify": "^1.0.1", "gulp-util": "^3.0.1", "jshint-stylish": "^0.4.0", diff --git a/web/src/css/app.less b/web/src/css/app.less index 39ac14cd..cc65cfdd 100644 --- a/web/src/css/app.less +++ b/web/src/css/app.less @@ -7,7 +7,7 @@ html { box-sizing: inherit; } -@import (less) "sprites.compiled.less"; +@import (less) "sprites.less"; @import (less) "layout.less"; @import (less) "header.less"; @import (less) "flowtable.less"; diff --git a/web/src/css/flowtable.less b/web/src/css/flowtable.less index deef9c81..f96b7abf 100644 --- a/web/src/css/flowtable.less +++ b/web/src/css/flowtable.less @@ -6,12 +6,21 @@ background-color: #dadada; } + tr { + cursor: pointer; + } + td { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } + //tr:nth-child(odd) { background-color : white; } + tr:nth-child(even) { background-color : rgba(0,0,0,0.05); } + //tr:hover { background-color : hsla(209, 52%, 84%, 0.5); } + + .col-tls { width: 10px; diff --git a/web/src/css/sprites.compiled.less b/web/src/css/sprites.compiled.less deleted file mode 100644 index 27951ee5..00000000 --- a/web/src/css/sprites.compiled.less +++ /dev/null @@ -1,58 +0,0 @@ -.resource-icon { - width: 32px; - height: 32px; -} - -// From Chrome Dev Tools -.resource-icon-css { - background-image: url("../images/sprite.png"); - background-position: -0px -0px; - background-size: 32px 320px!important; -} -.resource-icon-document { - background-image: url("../images/sprite.png"); - background-position: -0px -32px; - background-size: 32px 320px!important; -} -.resource-icon-js { - background-image: url("../images/sprite.png"); - background-position: -0px -64px; - background-size: 32px 320px!important; -} -.resource-icon-plain { - background-image: url("../images/sprite.png"); - background-position: -0px -96px; - background-size: 32px 320px!important; -} - -// Own -.resource-icon-executable { - background-image: url("../images/sprite.png"); - background-position: -0px -128px; - background-size: 32px 320px!important; -} -.resource-icon-flash { - background-image: url("../images/sprite.png"); - background-position: -0px -160px; - background-size: 32px 320px!important; -} -.resource-icon-image { - background-image: url("../images/sprite.png"); - background-position: -0px -192px; - background-size: 32px 320px!important; -} -.resource-icon-java { - background-image: url("../images/sprite.png"); - background-position: -0px -224px; - background-size: 32px 320px!important; -} -.resource-icon-not-modified { - background-image: url("../images/sprite.png"); - background-position: -0px -256px; - background-size: 32px 320px!important; -} -.resource-icon-redirect { - background-image: url("../images/sprite.png"); - background-position: -0px -288px; - background-size: 32px 320px!important; -}
\ No newline at end of file |