From 841aa40cf025b80ff004869da8b2b62aefb71b02 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Tue, 4 Jun 2019 18:08:22 +1000
Subject: [PATCH] fix skill btn

---
 client/assets/styles/game.css          | 12 ++++++------
 client/assets/styles/styles.css        |  2 +-
 client/assets/styles/styles.mobile.css |  4 ++++
 client/src/components/skill.btn.jsx    |  8 ++++----
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/client/assets/styles/game.css b/client/assets/styles/game.css
index ebe38f94..add6299a 100644
--- a/client/assets/styles/game.css
+++ b/client/assets/styles/game.css
@@ -10,7 +10,7 @@
         "player";
 }
 
-.team {
+.game .team {
     display: grid;
     grid-template-columns: repeat(3, 1fr);
 
@@ -30,7 +30,7 @@
 
 .opponent .combat-text {
     left: 40%;
-    transform: translate(-50%, -50%);
+    top: 75%;
 }
 
 .opponent .game-construct {
@@ -75,10 +75,6 @@
     transition-timing-function: ease;
 }
 
-.game-construct .name {
-    white-space: nowrap;
-}
-
 #targeting {
     grid-area: target;
     height: 100%;
@@ -401,6 +397,10 @@
 
 
 @media (max-height: 800px), (max-width: 1000px) {
+    .game {
+        grid-template-rows: 1fr 0.2fr 1.5fr;
+    }
+
     .game .stats div {
         padding: 0;
     }
diff --git a/client/assets/styles/styles.css b/client/assets/styles/styles.css
index 84d8e02b..1ae1e78f 100644
--- a/client/assets/styles/styles.css
+++ b/client/assets/styles/styles.css
@@ -347,10 +347,10 @@ header {
 */
 
 .team {
-    display: flex;
     display: grid;
     grid-gap: 1em;
     grid-template-columns: repeat(auto-fill,minmax(200px, 1fr));
+    max-height: 100%;
 }
 
 .menu-construct {
diff --git a/client/assets/styles/styles.mobile.css b/client/assets/styles/styles.mobile.css
index 3bf9a465..9ef359c1 100644
--- a/client/assets/styles/styles.mobile.css
+++ b/client/assets/styles/styles.mobile.css
@@ -48,4 +48,8 @@
     .login {
         width: 100%;
     }
+
+    .timer-container {
+        margin: 0.5em 0 0 0;
+    }
 }
diff --git a/client/src/components/skill.btn.jsx b/client/src/components/skill.btn.jsx
index a1cbaf18..ecb2a02d 100644
--- a/client/src/components/skill.btn.jsx
+++ b/client/src/components/skill.btn.jsx
@@ -47,12 +47,12 @@ function Skill(props) {
         );
     }
 
-    const skillChosen = game.stack.some(stack => stack.source_construct_id === construct.id);
+    // const skillChosen = game.stack.some(stack => stack.source_construct_id === construct.id);
     const targeting = game.stack.some(stack => stack.source_construct_id === construct.id && stack.skill === s.skill);
 
-    if (skillChosen && !targeting) {
-        return false;
-    }
+    // if (skillChosen && !targeting) {
+    //     return false;
+    // }
 
     const cdText = construct.skills[i].cd > 0
         ? `- ${s.cd}T`