diff --git a/client/assets/styles/instance.css b/client/assets/styles/instance.css index f6cfdff8..1e946a42 100644 --- a/client/assets/styles/instance.css +++ b/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; diff --git a/client/assets/styles/styles.css b/client/assets/styles/styles.css index 216a8856..c605a92a 100644 --- a/client/assets/styles/styles.css +++ b/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; diff --git a/client/assets/styles/styles.mobile.css b/client/assets/styles/styles.mobile.css index 06cf4d54..39707849 100644 --- a/client/assets/styles/styles.mobile.css +++ b/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 { diff --git a/client/src/components/nav.jsx b/client/src/components/nav.jsx index c8380893..1dc6c916 100644 --- a/client/src/components/nav.jsx +++ b/client/src/components/nav.jsx @@ -13,6 +13,7 @@ const addState = connect( instances, team, cryps, + game, } = state; function sendInstanceState(instance) { @@ -26,6 +27,7 @@ const addState = connect( instances, team, cryps, + game, sendInstanceState, }; }, @@ -59,6 +61,7 @@ function Nav(args) { team, cryps, instances, + game, navTo, setTestGame, @@ -66,7 +69,7 @@ function Nav(args) { } = args; function joinInstance(i) { - navTo(null); + if (game) navTo(null); sendInstanceState(i); return true; }