Merge pull request #156 from daithihearn/daithi_ui

Minor UI improvements
daithihearn · Mar 12, 2023 · 892dced · 892dced
2 parents 0f82547 + fd5af7d
commit 892dced
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "frontend",
-    "version": "5.5.8",
+    "version": "5.5.9",
     "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.8",
+  "version": "5.5.9",
   "icons": [
     {
       "src": "./assets/favicon.png",

diff --git a/src/components/Game/Actions/Buying.tsx b/src/components/Game/Actions/Buying.tsx
@@ -81,7 +81,7 @@ const Buying = () => {
             <Button
                 type="button"
                 onClick={toggleReadyToBuy}
-                color={isMyGo || !readyToBuy ? "primary" : "info"}>
+                color={isMyGo || !readyToBuy ? "primary" : "secondary"}>
                 <b>
                     {isMyGo || !readyToBuy
                         ? "Keep Cards"

diff --git a/src/components/Game/Actions/PlayCard.tsx b/src/components/Game/Actions/PlayCard.tsx
@@ -12,8 +12,8 @@ import parseError from "utils/ErrorUtils"
 import { RoundStatus } from "model/Round"
 
 const WaitingForYourTurn = () => (
-    <Button disabled type="button" color="info">
-        <b>Wait for your turn...</b>
+    <Button disabled type="button" color="secondary">
+        <b>Waiting for your turn...</b>
     </Button>
 )
 

diff --git a/src/components/Game/Actions/SelectSuit.tsx b/src/components/Game/Actions/SelectSuit.tsx
@@ -14,7 +14,7 @@ import { SelectableCard } from "model/Cards"
 import parseError from "utils/ErrorUtils"
 
 const WaitingForSuit = () => (
-    <Button disabled type="button" color="info">
+    <Button disabled type="button" color="secondary">
         <b>Waiting for suit...</b>
     </Button>
 )

diff --git a/src/components/Game/PlayerCard.tsx b/src/components/Game/PlayerCard.tsx
@@ -70,8 +70,10 @@ const PlayerCard: React.FC<PlayerRowI> = ({ player, className }) => {
                         <CardImg
                             alt={profile.name}
                             src={`/cards/thumbnails/${
-                                isCurrentPlayer ? "yellow" : "blank_grey"
-                            }_back.png`}
+                                isCurrentPlayer
+                                    ? "yellow_back.png"
+                                    : "blank_card_outline.png"
+                            }`}
                             className={`img-center thumbnail_size`}
                         />
 

diff --git a/src/pages/Game/_game.scss b/src/pages/Game/_game.scss
@@ -51,8 +51,10 @@
 
 .overlay-score {
     font-weight: bolder;
-    font-size: large;
-    margin-top: 3rem;
+    font-size: 1.6em;
+    margin-top: 2.6rem;
+    mix-blend-mode: lighten;
+    color: white;
 }
 
 .overlay-dealer-chip {