From 743c5a792dd2381a7c87f0cf1f08d8856414d789 Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 2 Apr 2019 17:05:54 +1100 Subject: [PATCH] wip --- html-client/cryps.css | 42 ++++++++++--------- html-client/src/components/game.component.jsx | 28 +++++++------ .../src/components/instance.component.jsx | 14 ++++--- 3 files changed, 46 insertions(+), 38 deletions(-) diff --git a/html-client/cryps.css b/html-client/cryps.css index 3a80ebc8..8f296e1c 100755 --- a/html-client/cryps.css +++ b/html-client/cryps.css @@ -202,7 +202,7 @@ header { } .instance-info { - flex: 1 0 50%; + flex: 0 1 50%; } .instance .spacer { @@ -233,7 +233,7 @@ header { } .vbox { - flex: 0 0 25%; + flex: 1 1 25%; display: flex; flex-flow: row wrap; @@ -292,33 +292,35 @@ header { } .instance-cryp-list { - flex: 0 0 25%; + flex: 1 1 25%; + display: flex; flex-flow: column; - - padding: 0 2em 0 2em; + height: 95%; } /* CRYP BOX */ .cryp-box { flex: 1 1 100%; - display: flex; - flex-flow: row wrap; - justify-content: center; - /* - this controls the size of the box - as it fills the whole container - */ - margin: 0 0 1em 0; + flex-flow: column; border: 1px solid whitesmoke; + margin-bottom: 1em; + justify-content: center; +} + +.cryp-box-top { + display: flex; + flex: 1 1 80%; + width: 100%; + justify-content: center; } .cryp-box figure { margin: 0; - flex: 0 1 50%; + flex: 0 0 50%; text-align: center; box-sizing: border-box; display: flex; @@ -326,8 +328,9 @@ header { } .cryp-box .stats { - display: flex; + flex: 0 0 20%; width: 100%; + display: flex; border-top: 1px solid whitesmoke; } @@ -349,16 +352,15 @@ header { } .cryp-box .skills { - width: 50%; - min-width: 150px; + display: flex; + flex-flow: row wrap; flex: 1 1 50%; } .cryp-skill-btn { - font-size: 125%; + flex: 1 1 100%; + font-size: 16pt; border-width: 1px; - width: 100%; - height: 25%; padding: 0; margin: 0; border-bottom-width: 0px; diff --git a/html-client/src/components/game.component.jsx b/html-client/src/components/game.component.jsx index 0f80e7d2..25b24f69 100644 --- a/html-client/src/components/game.component.jsx +++ b/html-client/src/components/game.component.jsx @@ -103,14 +103,16 @@ function GamePanel(props) { key={cryp.id} style={ activeSkill ? { cursor: 'pointer' } : {}} className="cryp-box" > -
selectSkillTarget(cryp.id)} > - {molecule} -
{cryp.name}
-
-
- {skills} +
+
selectSkillTarget(cryp.id)} > + {molecule} +
{cryp.name}
+
+
+ {skills} +
{stats} @@ -149,10 +151,12 @@ function GamePanel(props) { className="cryp-box" style={ activeSkill ? { cursor: 'pointer' } : {}} onClick={() => selectSkillTarget(cryp.id)} > -
- {molecule} -
{cryp.name}
-
+
+
+ {molecule} +
{cryp.name}
+
+
{stats}
diff --git a/html-client/src/components/instance.component.jsx b/html-client/src/components/instance.component.jsx index 7ab78fe5..f69b92f1 100644 --- a/html-client/src/components/instance.component.jsx +++ b/html-client/src/components/instance.component.jsx @@ -51,12 +51,14 @@ function Cryp(cryp, sendVboxApply, setInfo) { onDragOver={onDragOver} onDrop={onDrop} > -
- {molecule} -
{cryp.name}
-
-
- {skills} +
+
+ {molecule} +
{cryp.name}
+
+
+ {skills} +
{stats}