Merge branch '0.0.x/main' of https://github.com/ItsSammyM/mafia-rust …

…into 0.0.x/main
mafia-rust · Dec 5, 2023 · 7fda8c2 · 7fda8c2 · vercel · Dec 5, 2023
2 parents 86105d0 + fbccc2c
commit 7fda8c2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/client/src/menu/game/HeaderMenu.tsx b/client/src/menu/game/HeaderMenu.tsx
@@ -137,7 +137,7 @@ export default class HeaderMenu extends React.Component<HeaderMenuProps, HeaderM
 
     render(){
         const timerStyle = {
-            paddingTop: '1%',
+            paddingTop: '100%',
             backgroundColor: 'red',
             width: `${(this.state.gameState.timeLeftMs) * (100/(60*1000))}%`,
             margin: '0 auto', // Center the timer horizontally

diff --git a/client/src/menu/game/gameScreenContent/chatMenu.css b/client/src/menu/game/gameScreenContent/chatMenu.css
@@ -6,6 +6,7 @@
     height: 100%;
     max-height: 100%;
     max-width: 100%;
+    background-color: var(--background-color);
 }
 .chat-menu .content-tab {
     background-color: #132936;

diff --git a/client/src/menu/game/headerMenu.css b/client/src/menu/game/headerMenu.css
@@ -38,7 +38,7 @@
 } 
 .header-menu .timer-box{
     width: 100%;
-    height: 100%;
+    height: .5rem;
     margin: 0%;
     padding: 0%;
     background-color: #220000;