krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-14 13:17:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Corrected sprite task

Browse Source
This commit is contained in:
Blade Barringer
2015-02-03 19:29:22 -06:00
parent bf6fdf8d9d
commit 44a89dd0bd
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -1,5 +1,6 @@
.DS_Store .DS_Store
website/public/gen website/public/gen
website/public/common
node_modules node_modules
*.swp *.swp
.idea* .idea*
@@ -8,7 +9,7 @@ npm-debug.log
lib lib
website/public/bower_components website/public/bower_components
common/dist common/dist
build website/build
newrelic_agent.log newrelic_agent.log
.bower-tmp .bower-tmp
.bower-registry .bower-registry

9
gulpfile.js
View File

@@ -34,7 +34,7 @@ var paths = {
sprites: { sprites: {
src: './common/img/sprites/spritesmith/**/*.png', src: './common/img/sprites/spritesmith/**/*.png',
dest: './common/dist/sprites/', dest: './common/dist/sprites/',
cssminSrc: './common/dist/sprites/*.css', cssminSrc: './common/dist/sprites/spritesmith*.css',
cssminDest: './common/dist/sprites/' cssminDest: './common/dist/sprites/'
}, },
copy: { copy: {
@@ -95,9 +95,8 @@ gulp.task('sprite', function(cb) {
var sprite = {}; var sprite = {};
_.times(COUNT, function(i){ _.times(COUNT, function(i){
sliced = images.slice(i * (images.length/COUNT), (i+1) * images.length/COUNT)
sprite[''+i] = { sprite[''+i] = {
src: sliced, slice: images.slice(i * (images.length/COUNT), (i+1) * images.length/COUNT),
imgName: 'spritesmith'+i+'.png', imgName: 'spritesmith'+i+'.png',
cssName: 'spritesmith'+i+'.css', cssName: 'spritesmith'+i+'.css',
engine: 'phantomjssmith', engine: 'phantomjssmith',
@@ -131,7 +130,7 @@ gulp.task('sprite', function(cb) {
_.forIn(sprite, function(value, key){ _.forIn(sprite, function(value, key){
console.log("Starting spritesmith" + key + ".png"); console.log("Starting spritesmith" + key + ".png");
var spriteData = gulp.src(sliced).pipe(spritesmith(sprite[key])); var spriteData = gulp.src(sprite[key].slice).pipe(spritesmith(sprite[key]));
spriteData.img spriteData.img
//.pipe(imagemin()) //.pipe(imagemin())
@@ -146,8 +145,8 @@ gulp.task('sprite', function(cb) {
console.log("Finished spritesmith" + key + ".png"); console.log("Finished spritesmith" + key + ".png");
if(STEP >= COUNT) { if(STEP >= COUNT) {
gulp.src(paths.sprites.cssminSrc) gulp.src(paths.sprites.cssminSrc)
.pipe(concat('habitrpg-shared.css'))
.pipe(cssmin()) .pipe(cssmin())
.pipe(rename('habitrpg-shared.css'))
.pipe(gulp.dest(paths.sprites.cssminDest)) .pipe(gulp.dest(paths.sprites.cssminDest))
.on('end', function(){cb()}); .on('end', function(){cb()});
} }

2
website/public/manifest.json
View File

@@ -72,7 +72,7 @@
"app.css", "app.css",
"bower_components/pnotify/jquery.pnotify.default.css", "bower_components/pnotify/jquery.pnotify.default.css",
"bower_components/pnotify/jquery.pnotify.default.icons.css", "bower_components/pnotify/jquery.pnotify.default.icons.css",
"sprites/habitrpg-shared.css", "common/sprites/habitrpg-shared.css",
"fontello/css/fontelico.css" "fontello/css/fontelico.css"
] ]
}, },