Merge pull request #148 from daithihearn/daithihearn-styling

Layout and styling improvements
daithihearn · Feb 28, 2023 · eef92cc · eef92cc
2 parents 3371a33 + 3e397b6
commit eef92cc
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 43 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "frontend",
-    "version": "5.5.2",
+    "version": "5.5.3",
     "description": "React frontend for the Cards 110",
     "author": "Daithi Hearn",
     "license": "MIT",

diff --git a/public/manifest.json b/public/manifest.json
@@ -1,7 +1,7 @@
 {
   "short_name": "Cards 110",
   "name": "Cards 110",
-  "version": "5.5.2",
+  "version": "5.5.3",
   "icons": [
     {
       "src": "./assets/favicon.png",

diff --git a/src/components/Game/GameWrapper.tsx b/src/components/Game/GameWrapper.tsx
@@ -26,10 +26,10 @@ const GameWrapper = () => {
             <Card className="p-6 gameContainer" inverse>
                 <PlayersAndCards />
 
-                {!iamSpectator ? <MyCards /> : null}
                 {!iamSpectator && isCalling ? <Calling /> : null}
                 {!iamSpectator && isBuying ? <Buying /> : null}
                 {!iamSpectator ? <SelectSuit /> : null}
+                {!iamSpectator ? <MyCards /> : null}
             </Card>
         </CardGroup>
     )

diff --git a/src/pages/Home/_home.scss b/src/pages/Home/_home.scss
@@ -19,6 +19,7 @@
 
 .game_wrap {
     min-width: 650px;
+    max-width: 800px;
     overflow: overlay;
     margin-left: auto;
     margin-right: auto;
@@ -257,7 +258,6 @@
     }
     @media screen and (min-width: 800px) {
         .game_wrap {
-            min-width: 0;
             max-width: 790px;
         }
         .rwd-table tr:hover:not(:first-child) {
@@ -311,21 +311,12 @@
     }
 }
 
-.game_wrap {
-    min-width: 1000px;
-    max-width: 1300px;
-}
-
 .diplay_image_size {
     max-width: 1100px;
     max-height: 1024px;
 }
 
 @media only screen and (max-width: 1324px) {
-    .game_wrap {
-        min-width: 1100px;
-        max-width: 1300px;
-    }
 
     .diplay_image_size {
         max-width: 1100px;
@@ -334,10 +325,6 @@
 }
 
 @media only screen and (max-width: 1224px) {
-    .game_wrap {
-        min-width: 900px;
-        max-width: 1100px;
-    }
 
     .diplay_image_size {
         max-width: 1020px;
@@ -346,10 +333,6 @@
 }
 
 @media only screen and (max-width: 1124px) {
-    .game_wrap {
-        min-width: 800px;
-        max-width: 1000px;
-    }
 
     .diplay_image_size {
         max-width: 920px;
@@ -358,10 +341,6 @@
 }
 
 @media only screen and (max-width: 1024px) {
-    .game_wrap {
-        min-width: 700px;
-        max-width: 900px;
-    }
 
     .diplay_image_size {
         max-width: 800px;
@@ -371,10 +350,6 @@
 
 // Resposiveness for Mobile view.
 @media only screen and (max-width: 925px) {
-    .game_wrap {
-        min-width: 700px;
-        max-width: 900px;
-    }
 
     .diplay_image_size {
         max-width: 850px;
@@ -405,10 +380,6 @@
 }
 
 @media only screen and (max-width: 900px) {
-    .game_wrap {
-        min-width: 750px;
-        max-width: 823px;
-    }
 
     .diplay_image_size {
         max-width: 790px;
@@ -417,10 +388,6 @@
 }
 
 @media only screen and (max-width: 823px) {
-    .game_wrap {
-        min-width: 700px;
-        max-width: 800px;
-    }
 
     .diplay_image_size {
         max-width: 760px;
@@ -429,10 +396,6 @@
 }
 
 @media only screen and (max-width: 812px) {
-    .game_wrap {
-        min-width: 0;
-        max-width: 800px;
-    }
 
     .diplay_image_size {
         max-width: 720px;

diff --git a/src/scss/_custom.scss b/src/scss/_custom.scss
@@ -8,9 +8,8 @@ body {
     background-color: #2f855a;
     position: fixed;
     width: 100%;
-    height: 100vh;
+    height: 100%;
     overflow: overlay;
-    padding-bottom: 100px;
 
     &_mainBody {
         width: 100%;