Merge branch 'dist'

This commit is contained in:
John Firebaugh
2013-04-22 12:10:01 -07:00
63 changed files with 100 additions and 116 deletions
+2 -2
View File
@@ -8,13 +8,13 @@ sprite.sprite('renders', { path: makipath }, function(err, makiSprite) {
if (err) process.exit(1);
// Move image and json files
fs.renameSync(path.join(makipath, makiSprite.filename()), './img/maki-sprite.png');
fs.renameSync(path.join(makipath, makiSprite.filename()), './dist/img/maki-sprite.png');
fs.renameSync(path.join(makipath, 'renders.json'), './data/maki-sprite.json');
// Generate CSS
var template = '.maki-{name}{background-position:{x} {y};width:{w};height:{h};}\n';
var css = "/* This file is generated by make. Do NOT edit manually. */\n\n";
css += ".maki-icon{background-image:url('../img/maki-sprite.png');background-repeat:no-repeat;}\n";
css += ".maki-icon{background-image:url(img/maki-sprite.png);background-repeat:no-repeat;}\n";
makiSprite.images.forEach(function(image) {
if (image.width !== 24) return;