diff --git a/WORKLOG.md b/WORKLOG.md index 91f21879..cd6c0e6e 100644 --- a/WORKLOG.md +++ b/WORKLOG.md @@ -31,6 +31,8 @@ mobile info page +mnml tv + rework scatter hatred maybe diff --git a/client/assets/styles/instance.css b/client/assets/styles/instance.css index 7340377f..6b4fa16a 100644 --- a/client/assets/styles/instance.css +++ b/client/assets/styles/instance.css @@ -333,11 +333,11 @@ height: 2px; transform-origin: center; background-color: whitesmoke; - animation: equipping-skill 2s infinite ease alternate; + animation: equipping-skill 2s infinite ease-out alternate; opacity: 0; } -.equipping::after, .equip-spec::after { +.equipping::after { content: ''; position: absolute; bottom: 2px; @@ -346,7 +346,7 @@ height: 2px; transform-origin: center; background-color: whitesmoke; - animation: equipping-skill 2s infinite ease alternate; + animation: equipping-skill 2s infinite ease-out alternate; opacity: 0; animation-delay: 0.75s } @@ -373,7 +373,16 @@ } .equip-spec::after { - animation-delay: 0; + content: ''; + position: absolute; + bottom: 2px; + left: 50%; + width: 100%; + height: 2px; + transform-origin: center; + background-color: whitesmoke; + animation: equipping-skill 2s infinite ease-out alternate; + opacity: 0; } .equip .specs figcaption { diff --git a/client/src/components/game.footer.jsx b/client/src/components/game.footer.jsx index 69925fb8..3d242017 100644 --- a/client/src/components/game.footer.jsx +++ b/client/src/components/game.footer.jsx @@ -108,7 +108,7 @@ function GameFooter(props) { const now = Date.now(); const end = Date.parse(game.phase_end); const timerPct = ((now - zero) / (end - zero) * 100); - const displayPct = resolution || game.phase === 'Finish' + const displayPct = resolution || game.phase === 'Finish' || !game.phase_end ? 0 : Math.min(timerPct, 100); @@ -123,11 +123,13 @@ function GameFooter(props) { background: displayColour, }; - const timer = ( -
-
 
-
- ); + const timer = game.phase_end + ? ( +
+
 
+
+ ) + : null; return (