ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop

Browse Source
This commit is contained in:
Mashy 2019-11-08 09:59:21 +10:00
commit a4b0fc0c4f
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/assets/styles/game.less
View File

@ -252,12 +252,16 @@
grid-area: target;
text-align: center;
align-self: center;
height: auto;
// height: auto;
svg {
display: inline;
height: 1em;
margin-right: 0.1em
}
display: flex;
flex-flow: column;
justify-content: center;
}
.skill-description {

11
client/src/components/targeting.arrows.jsx
View File

@ -52,6 +52,7 @@ class TargetSvg extends Component {
itemInfo,
} = props;
const { width, height } = state;
if (!game) return false; // game will be null when battle ends
if (game.phase === 'Finished') return false; // Clear everything if its over (in case of abandon)
@ -59,7 +60,7 @@ class TargetSvg extends Component {
if (tutorialGame) {
return (
<div class="resolving-skill">
<h2><span> Select your skills, click on targets and then hit <b>READY</b>.</span></h2>
<h2>Select your skills, click on targets and then hit <b>READY</b>.</h2>
</div>
);
}
@ -72,8 +73,8 @@ class TargetSvg extends Component {
return (
<div class="resolving-skill">
<h1><span>{gameEffectInfo.effect}</span></h1>
<div><span>{infoDescription} </span></div>
<h1>{gameEffectInfo.effect}</h1>
<div>{infoDescription}</div>
</div>
);
}
@ -90,8 +91,8 @@ class TargetSvg extends Component {
const itemSourceDescription = reactStringReplace(itemSourceInfo, itemRegEx, match => shapes[match]());
return (
<div class="resolving-skill">
<h1><span>{animSkill}</span></h1>
<div><span>{itemSourceDescription}</span></div>
<h1>{animSkill}</h1>
<div>{itemSourceDescription}</div>
</div>
);
}