From 6cba30d2a1d275cd6261066e9c6171169f647c77 Mon Sep 17 00:00:00 2001 From: ntr Date: Wed, 15 May 2019 17:22:18 +1000 Subject: [PATCH] lookin good --- client/game.css | 34 +++++++++++++++--------- client/src/components/game.component.jsx | 18 ++++++------- client/src/components/game.cryp.jsx | 18 ++++++------- client/src/components/menu.component.jsx | 4 +-- client/src/utils.jsx | 1 + client/styles.css | 2 +- 6 files changed, 42 insertions(+), 35 deletions(-) diff --git a/client/game.css b/client/game.css index d7eb03e4..edbcfdfa 100644 --- a/client/game.css +++ b/client/game.css @@ -46,10 +46,10 @@ .opponent .game-cryp { grid-template-rows: auto auto minmax(0, 1fr) auto; grid-template-areas: - "stats" - "effects" - "avatar" - "skills"; + ". stats" + ". effects" + "target avatar" + ". skills"; } .game-cryp { @@ -57,12 +57,14 @@ justify-items: center; - grid-template-rows: minmax(0, 1fr) minmax(0, 2fr) auto minmax(0, 1fr); + /*grid-template-rows: minmax(0, 1fr) minmax(0, 2fr) auto minmax(0, 1fr);*/ + /*grid-template-columns: min-content minmax(0, 1fr);*/ + grid-template-columns: min-content 1fr 1fr; + grid-template-rows: 1fr 2fr 1fr; grid-template-areas: - "skills" - "avatar" - "effects" - "stats"; + ". skills skills" + "target avatar avatar" + "effects stats stats"; transition-property: all; transition-duration: 0.5s; @@ -70,10 +72,17 @@ transition-timing-function: ease; } -.game-cryp .avatar { +.game-cryp .targeting { + grid-area: target; + display: flex; + flex-flow: column; + justify-content: center; + align-items: flex-end; + width: 100%; +} + +.game-cryp .img { grid-area: avatar; - /*max-height: 50%;*/ - height: auto; } .game-cryp .stats { @@ -86,6 +95,7 @@ grid-area: skills; display: flex; flex-flow: column-reverse; + /*flex-flow: column;*/ } /*@media (max-width: 1000px) { diff --git a/client/src/components/game.component.jsx b/client/src/components/game.component.jsx index 8855c38a..4512a4e1 100644 --- a/client/src/components/game.component.jsx +++ b/client/src/components/game.component.jsx @@ -137,17 +137,15 @@ function GamePanel(props) {
{effects}
-
-
-
>
-
-
selectSkillTarget(cryp.id)} > - {crypAvatar(cryp.name)} - {combatTextEl} -
+
+
>
+
selectSkillTarget(cryp.id)} > + {crypAvatar(cryp.name)} + {combatTextEl} +
); } diff --git a/client/src/components/game.cryp.jsx b/client/src/components/game.cryp.jsx index af4d5b5d..397362d1 100644 --- a/client/src/components/game.cryp.jsx +++ b/client/src/components/game.cryp.jsx @@ -78,17 +78,15 @@ function GameCryp(props) {
{skills}
-
-
-
>
-
-
selectSkillTarget(cryp.id)} > - {crypAvatar(cryp.name)} - {combatTextEl} -
+
+
>
+
selectSkillTarget(cryp.id)} > + {crypAvatar(cryp.name)} + {combatTextEl} +
{effects}
diff --git a/client/src/components/menu.component.jsx b/client/src/components/menu.component.jsx index f144d3cd..cec5eb2f 100644 --- a/client/src/components/menu.component.jsx +++ b/client/src/components/menu.component.jsx @@ -67,7 +67,7 @@ function Menu(args) { // ); return ( -
+
@@ -84,7 +84,7 @@ function Menu(args) {
-
+
); } diff --git a/client/src/utils.jsx b/client/src/utils.jsx index 8cc4bb5b..1ecedf1b 100644 --- a/client/src/utils.jsx +++ b/client/src/utils.jsx @@ -57,6 +57,7 @@ function crypAvatar(name) { return ( event.target.setAttribute('src', '/molecules/726.svg')} /> ); diff --git a/client/styles.css b/client/styles.css index 97431553..8bb729a6 100644 --- a/client/styles.css +++ b/client/styles.css @@ -53,7 +53,7 @@ figure { main { padding: 0 2em; display: grid; - grid-template-columns: repeat(10, 10%)); + grid-template-columns: repeat(10, 1fr); grid-template-rows: min-content 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr; grid-template-areas: