diff --git a/client/game.css b/client/game.css index 2b9c8f82..38789d1c 100644 --- a/client/game.css +++ b/client/game.css @@ -46,23 +46,26 @@ .opponent .game-cryp { grid-template-rows: auto auto minmax(0, 1fr) auto; grid-template-areas: - "stats" - "effects" - "avatar" - "skills"; + "stats ." + "effects ." + "avatar target" + "skills ."; } .game-cryp { display: grid; - justify-items: center; + /*justify-items: center;*/ + justify-items: start; - 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: 1fr min-content 1fr; + grid-template-rows: 1fr 2fr 1fr; grid-template-areas: - "skills" - "avatar" - "effects" - "stats"; + "skills . ." + "avatar target ." + "stats stats effects"; transition-property: all; transition-duration: 0.5s; @@ -70,6 +73,15 @@ transition-timing-function: ease; } +.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; } @@ -80,10 +92,21 @@ flex-flow: row; } +.game-cryp figure { + padding: 0 0.5em; +} + +.game-cryp figcaption { + white-space: nowrap; + font-size: 100%; +} + .game-cryp .skills { grid-area: skills; display: flex; flex-flow: column-reverse; + align-items: baseline; + /*flex-flow: column;*/ } /*@media (max-width: 1000px) { diff --git a/client/instance.css b/client/instance.css index a21973a7..fcb51dd2 100644 --- a/client/instance.css +++ b/client/instance.css @@ -6,12 +6,6 @@ height: 100%; } -.instance-hdr { - display: flex; - flex-flow: column; - flex: 1; -} - .instance-info { flex: 0 1 35%; padding-left: 1em; @@ -44,11 +38,7 @@ flex: 0 0 50%; } -.ready-btn { - flex: 1 0 50%; -} - -.ready-btn:hover { +.ready:hover { transition-property: all; transition-duration: 0.5s; transition-timing-function: ease; diff --git a/client/src/components/game.component.jsx b/client/src/components/game.component.jsx index aeea8df6..935e5c1a 100644 --- a/client/src/components/game.component.jsx +++ b/client/src/components/game.component.jsx @@ -52,9 +52,9 @@ function GamePanel(props) { } const header = ( -
+
@@ -137,6 +137,9 @@ function GamePanel(props) {
{effects}
+
+
{'<'}
+
selectSkillTarget(cryp.id)} > diff --git a/client/src/components/game.cryp.jsx b/client/src/components/game.cryp.jsx index 17d49e80..1d5c5178 100644 --- a/client/src/components/game.cryp.jsx +++ b/client/src/components/game.cryp.jsx @@ -78,6 +78,9 @@ function GameCryp(props) {
{skills}
+
+
{'<'}
+
selectSkillTarget(cryp.id)} > diff --git a/client/src/components/instance.component.jsx b/client/src/components/instance.component.jsx index d10380fd..5c08c07e 100644 --- a/client/src/components/instance.component.jsx +++ b/client/src/components/instance.component.jsx @@ -18,7 +18,7 @@ function InstanceComponent(args) { if (!instance) return false; - const rdyClasses = `instance-btn instance-ui-btn ready-btn ${player.ready ? 'ready' : ''}`; + const rdyClasses = `instance-btn instance-ui-btn ${player.ready ? 'ready' : ''}`; const readyBtn = (