Skip to content

Commit

Permalink
Preparing release 1.1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Yemachu committed Jun 16, 2019
2 parents 2be5c67 + 414e9a4 commit b1d9aa2
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions build/cardmaker.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/tcg/ygo/layout/component/CardName.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ define(["react", "react-class", "draw/Text", "../../Rarities"], function CardNam

var stylePreset = {
regular: {
fontFamily: ["Spectral SC", "serif"],
fontFamily: ["Matrix Regular Small Caps", "Spectral SC", "serif"],
fontSize: 32,
fontStyle: "normal",
fontWeight: 600,
Expand Down
4 changes: 2 additions & 2 deletions src/tcg/ygo/layout/component/Copyright.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ define(["react", "react-class", "draw/Text"], function Copyright(React, ReactCla
render: function render()
{
return React.createElement(Text, { text: this.props.value, style: {
fontFamily: ["Spectral", "serif"],
fontFamily: ["Matrix Book", "Spectral", "serif"],
color: this.props.color,
fontSize: 12,
textAlign: "right",
whitespace: "nowrap",

left: 230,
top: 580,
width: 150,
Expand Down
6 changes: 3 additions & 3 deletions src/tcg/ygo/layout/component/Effect.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ define(["react", "react-class", "draw/Text"], function Effect(React, ReactClass,
{
var styles = {
Monster: {
fontFamily: ["Spectral", "serif"],
fontFamily: ["Matrix Book", "Spectral", "serif"],

fontSize: 13,
textAlign: "justify",
Expand All @@ -13,7 +13,7 @@ define(["react", "react-class", "draw/Text"], function Effect(React, ReactClass,
height: 75
},
Backrow: {
fontFamily: ["Spectral", "serif"],
fontFamily: ["Matrix Book", "Spectral", "serif"],

fontSize: 13,
textAlign: "justify",
Expand All @@ -37,7 +37,7 @@ define(["react", "react-class", "draw/Text"], function Effect(React, ReactClass,
},

Skill: {
fontFamily: ["Spectral", "serif"],
fontFamily: ["Matrix Book", "Spectral", "serif"],

fontSize: 13,
textAlign: "justify",
Expand Down
6 changes: 3 additions & 3 deletions src/tcg/ygo/layout/component/Id.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
define(["react", "react-class", "draw/Text"], function Id(React, ReactClass, Text)
{
var shared = {
fontFamily: ["Spectral", "serif"],
fontFamily: ["Matrix Book", "Spectral", "serif"],
fontSize: 12,
whitespace: "nowrap",

height: undefined
}
var styles = {
Expand All @@ -28,7 +28,7 @@ define(["react", "react-class", "draw/Text"], function Id(React, ReactClass, Tex
width: 80,
}
};

var Id = ReactClass({
render: function render()
{
Expand Down
10 changes: 5 additions & 5 deletions src/tcg/ygo/layout/component/Link.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
define(["react", "react-class", "draw/Text"], function Link(React, ReactClass, Text)
{
var style = {
fontFamily: ["Audiowide", "sans-serif"],
fontFamily: ["IDroid", "Audiowide", "sans-serif"],
fontSize: 16,
textAlign: "right",
whitespace: "nowrap",

left: 370,
top: 552,
width: 15,
height: undefined
};

var Link = ReactClass({
render: function render()
{
return React.createElement(Text, { text: this.props.value, style: style, repaint: this.props.repaint, canvas: this.props.canvas })
}
});

Link.displayName = "Link";
Link.defaultProps = {

}
return Link;
});
18 changes: 9 additions & 9 deletions src/tcg/ygo/layout/component/Pendulum.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ define(["react", "react-class", "draw/Group", "draw/Text"], function Pendulum(Re
render: function render()
{
return this.props.enabled ? React.createElement(
Group,
Group,
{ canvas: this.props.canvas, repaint: this.props.repaint },
React.createElement(
Text,
{
Text,
{
text: this.props.effect,
style: {
fontFamily: ["Spectral", "serif"],
fontFamily: ["Matrix Book", "Spectral", "serif"],

fontSize: 13,
textAlign: "justify",

left: 65,
top: 385,
width: 290,
Expand All @@ -24,15 +24,15 @@ define(["react", "react-class", "draw/Group", "draw/Text"], function Pendulum(Re
}
),
React.createElement(
Text,
Text,
{
text: this.props.blue,
style: {
fontFamily: ["Crimson Text", "serif"],
fontSize: 28,
textAlign: "center",
fontWeight: 600,

left: 32,
top: 410,
width: 23,
Expand All @@ -49,7 +49,7 @@ define(["react", "react-class", "draw/Group", "draw/Text"], function Pendulum(Re
fontSize: 28,
textAlign: "center",
fontWeight: 600,

left: 365,
top: 410,
width: 23,
Expand Down
4 changes: 2 additions & 2 deletions src/tcg/ygo/layout/component/Serial.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ define(["react", "react-class", "draw/Text"], function Serial(React, ReactClass,
render: function render()
{
return React.createElement(Text, { text: this.props.value, style: {
fontFamily: ["Spectral", "serif"],
fontFamily: ["Matrix Book", "Spectral", "serif"],
color: this.props.color,
fontSize: 12,
textAlign: "left",
whitespace: "nowrap",

left: 20,
top: 580,
width: 150,
Expand Down

0 comments on commit b1d9aa2

Please sign in to comment.