Skip to content

Commit

Permalink
Components.Card: don't be svg
Browse files Browse the repository at this point in the history
  • Loading branch information
serprex committed May 30, 2018
1 parent 60340a2 commit 54fa34c
Show file tree
Hide file tree
Showing 8 changed files with 192 additions and 128 deletions.
5 changes: 1 addition & 4 deletions build.ninja
@@ -1,13 +1,10 @@
rule mkcjs
command=mkcjs $out $in
rule ssheet
command=spritesheet-js $in --customFormat atlas.template --extension=js -n assets/atlas
rule optipng
command=optipng -o2 -strip all $out
rule mkatlascss
command=./scripts/mkatlascss.js $out $in
build tournify.js:mkcjs tournament/commoner.js tournament/dodrio.js
build assets/atlas.js:ssheet assets/gold.png assets/shinyborder.png assets/e0.png assets/e1.png assets/e2.png assets/e3.png assets/e4.png assets/e5.png assets/e6.png assets/e7.png assets/e8.png assets/e9.png assets/e10.png assets/e11.png assets/e12.png assets/e13.png assets/e14.png assets/r1.png assets/r2.png assets/r3.png assets/r4.png assets/r5.png assets/t0.png assets/t1.png assets/t2.png assets/t3.png assets/t4.png assets/t5.png assets/sanctuary.png assets/silence.png assets/singularity.png assets/protection.png assets/sacrifice.png assets/s0.png assets/s1.png assets/s2.png assets/s3.png assets/s4.png assets/s5.png assets/s6.png assets/sabbath.png assets/sborder0.png assets/sborder1.png assets/sborder2.png assets/cback.png
build assets/atlas.png:optipng assets/atlas.js
build assets/atlas.css:mkatlascss assets/atlas.png | scripts/mkatlascss.js
default tournify.js assets/atlas.png assets/atlas.css
default assets/atlas.png assets/atlas.css
225 changes: 117 additions & 108 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -24,12 +24,12 @@
"@babel/preset-react": "^7.0.0-beta.49",
"babel-loader": "^8.0.0-beta.3",
"optipng-bin": "^4.0",
"prettier": "^1.12.1",
"prettier": "^1.13.2",
"react": "^16.4.0",
"react-dom": "^16.4.0",
"react-redux": "^5.0.7",
"redux": "^4.0.0",
"webpack": "^4.9.1",
"webpack": "^4.10.1",
"webpack-cli": "^2.1.4"
},
"scripts": {
Expand Down
1 change: 0 additions & 1 deletion server.js
Expand Up @@ -595,7 +595,6 @@ const sockmeta = new WeakMap();
i--;
count -= bci.q;
if (!count) break;
continue;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Editor.js
Expand Up @@ -86,7 +86,7 @@ module.exports = class Editor extends React.PureComponent {
}}
/>
{marksel}
<Components.Card x={734} y={8} card={this.state.card} />
<Components.Card x={734} y={8} code={this.state.card} />
</>;
}
};

0 comments on commit 54fa34c

Please sign in to comment.