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

Merge branch 'vbox-layout' into new-vbox-combiner

Browse Source
This commit is contained in:
Mashy 2019-11-24 15:50:26 +10:00
commit 74f47e7cb5
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@
position: absolute; position: absolute;
bottom: 0; bottom: 0;
margin-bottom: 0.5em;
height: 50%; height: 50%;
.avatar { .avatar {
@ -232,8 +233,8 @@
#targeting, .resolving-skill { #targeting, .resolving-skill {
position: absolute; position: absolute;
top: 35%; top: calc(35% + 0.5em); // calc for 0.5em top gap
height: 15%; height: calc(15% - 1em); // calc for 0.5em + 0.5em top / bottom gap
width: calc(90% - 1.25em); width: calc(90% - 1.25em);
z-index: 2; z-index: 2;
span { span {
@ -273,7 +274,7 @@
/* some stupid bug in chrome makes it fill the entire screen */ /* some stupid bug in chrome makes it fill the entire screen */
@media screen and (-webkit-min-device-pixel-ratio:0) { @media screen and (-webkit-min-device-pixel-ratio:0) {
#targeting { #targeting {
max-height: 10em; // max-height: 10em;
} }
} }

13
client/assets/styles/styles.mobile.less
View File

@ -1,7 +1,6 @@
@media (max-width: 800px) { @media (max-width: 800px) {
body { body {
overflow-y: initial; overflow-y: initial;
} }
#mnml { #mnml {
@ -19,7 +18,7 @@
stroke-width: 1.25em; stroke-width: 1.25em;
} }
.avatar { .avatar {
display: none; opacity: 0.1;
} }
} }
@ -138,7 +137,7 @@
} }
// portrait menu // portrait menu or small size vertical in landscape
@media (max-width: 600px) { @media (max-width: 600px) {
#mnml { #mnml {
grid-template-columns: 1fr; grid-template-columns: 1fr;
@ -206,6 +205,14 @@
} }
} }
.stats {
font-size: 6pt;
}
.skill-description {
font-size: 6pt;
}
section { section {
.list { .list {
grid-template-columns: 1fr; grid-template-columns: 1fr;

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

@ -110,8 +110,11 @@ class TargetSvg extends Component {
? playerTeam.constructs.findIndex(c => c.id === cast.target_construct_id) ? playerTeam.constructs.findIndex(c => c.id === cast.target_construct_id)
: otherTeam.constructs.findIndex(c => c.id === cast.target_construct_id); : otherTeam.constructs.findIndex(c => c.id === cast.target_construct_id);
const skillNumber = window.innerWidth <= 800 // mobile styling trigger
? playerTeam.constructs[source].skills.findIndex(s => s.skill === cast.skill)
: 0;
const sourceY = height; const sourceY = height;
const sourceX = (source * width / 3) + width / 24; const sourceX = (source * width / 3) + width / 18 + skillNumber * (width / 9);
const targetX = (target * width / 3) + width / 6 const targetX = (target * width / 3) + width / 6
+ (defensive ? width / 64 : 0) + (defensive ? width / 64 : 0)
+ (source * width / 18); + (source * width / 18);