Merge branch 'master' of ssh://cryps.gg:40022/~/cryps

client/assets/styles/game.css

@@ -205,7 +205,6 @@
     position: absolute;
     top: 50%;
     left: 50%;
-    text-align: center;
 }
 
 CRYP DAMAGE

client/assets/styles/instance.css

@@ -133,7 +133,7 @@
 }
 
 .vbox-table td {
-    transition-property: color background border;
+    transition-property: color, background, border;
     transition-duration: 0.5s;
     transition-delay: 0;
     transition-timing-function: ease;
@@ -162,11 +162,11 @@
     padding: 0.5em;
     border: 2px solid #222;
     border-left-width: 0;
-    transition-property: all;
+/*    transition-property: all;
     transition-duration: 0.5s;
     transition-delay: 0;
     transition-timing-function: ease;
-}
+*/}
 
 .instance-cryp:first-child {
     margin-left: 0;

client/assets/styles/styles.css

@@ -142,7 +142,7 @@ button, input {
     font-size: 100%;
 
     /*the transitions */
-    transition-property: all;
+    transition-property: color;
     transition-duration: 0.5s;
     transition-delay: 0;
     transition-timing-function: ease;
@@ -473,7 +473,7 @@ main .top {
 }
 
 .ready:hover {
-    transition-property: all;
+    transition-property: color, border-color;
     transition-duration: 0.5s;
     transition-timing-function: ease;
     color: forestgreen;

client/assets/styles/styles.mobile.css

@@ -1,6 +1,7 @@
 @media (max-height: 800px), (max-width: 1000px) {
     #cryps {
         font-size: 12pt;
+        padding: 0;
         grid-template-columns: min-content 1fr;
         grid-template-rows: min-content 1fr;
         grid-template-areas:
@@ -28,13 +29,13 @@
         transition: all 0.5s ease-in-out;
 
     }
-    main {
+/*    main {
         -webkit-transition: all 0.5s ease-in-out;
         -moz-transition: all 0.5s ease-in-out;
         -o-transition: all 0.5s ease-in-out;
         transition: all 0.5s ease-in-out;
     }
-
+*/
     #toggle-nav { display: none; }
 
     #toggle-nav-label {

client/src/components/main.jsx

@@ -47,7 +47,7 @@ function Main(props) {
     if (nav === 'list') return <List />;
 
     return (
-        <Team />
+        <main></main>
     );
 }
 

client/src/components/nav.jsx

@@ -13,9 +13,12 @@ const addState = connect(
             instances,
             team,
             cryps,
+            game,
         } = state;
 
         function sendInstanceState(instance) {
+            ws.clearGameStateTimeout();
+            ws.clearInstanceStateTimeout();
             return ws.sendInstanceState(instance.id);
         }
 
@@ -24,6 +27,7 @@ const addState = connect(
             instances,
             team,
             cryps,
+            game,
             sendInstanceState,
         };
     },
@@ -57,14 +61,21 @@ function Nav(args) {
         team,
         cryps,
         instances,
+        game,
 
         navTo,
         setTestGame,
         setTestInstance,
     } = args;
 
+    function joinInstance(i) {
+        if (game) navTo(null);
+        sendInstanceState(i);
+        return true;
+    }
+
     const joined = instances.map(i => (
-        <button key={i.id} onClick={() => sendInstanceState(i)} >{i.name}</button>
+        <button key={i.id} onClick={() => joinInstance(i)} >{i.name}</button>
     ));
 
     const teamElements = team.map((c, i) => {

client/src/events.jsx

@@ -101,6 +101,7 @@ function registerEvents(store) {
 
     function setAccount(account) {
         store.dispatch(actions.setAccount(account));
+        store.dispatch(actions.setNav('team'));
     }
 
     function clearCombiner() {