Merge branch 'main' into prod

aukus-devs · Sep 26, 2024 · 4b490ce · 4b490ce
2 parents 4a12d28 + da78dff
commit 4b490ce
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 7 deletions.
diff --git a/src/App.css b/src/App.css
@@ -112,3 +112,23 @@ div.MuiAutocomplete-root {
 div.Mui-focused {
   border: 2px solid #007aff;
 }
+
+::-webkit-scrollbar {
+  width: 12px; /* for vertical scrollbar */
+  height: 12px; /* for horizontal scrollbar */
+}
+
+::-webkit-scrollbar-track {
+  background: #0c0c0c; /* color of the tracking area */
+}
+
+::-webkit-scrollbar-thumb {
+  background-color: #007aff; /* color of the scroll thumb */
+  border-radius: 20px; /* roundness of the scroll thumb */
+  border: 3px solid #0c0c0c; /* creates padding around scroll thumb */
+}
+
+* {
+  scrollbar-width: auto; /* Makes the scrollbar thinner */
+  scrollbar-color: #007aff #0c0c0c; /* Scroll thumb color and track color */
+}
diff --git a/src/components/MainMenu.tsx b/src/components/MainMenu.tsx
@@ -25,7 +25,7 @@ export default function MainMenu({ currentPage }: Props) {
   const playerColor = currentPlayer && getPlayerColor(currentPlayer)
 
   return (
-    <Box>
+    <Box marginBottom={'100px'}>
       <Box
         display="block"
         textAlign={'center'}
@@ -53,7 +53,7 @@ export default function MainMenu({ currentPage }: Props) {
           </LinkSpan>
         </Link>
       </Box>
-      <Box display="flex" justifyContent={'center'} marginBottom={'100px'}>
+      <Box display="flex" justifyContent={'center'}>
         <Box
           padding={'10px'}
           display="flex"

diff --git a/src/pages/map/components/PlayerIcon.tsx b/src/pages/map/components/PlayerIcon.tsx
@@ -109,9 +109,19 @@ export default function PlayerIcon({
     }
 
     if (ladder) {
-      animationsList.push(
-        calculateAnimation(player.map_position, ladder.cellTo)
+      const ladderAnimation = calculateAnimation(
+        player.map_position,
+        ladder.cellTo
       )
+      if (player.map_position === 0) {
+        const adjustedForStart = {
+          x: ladderAnimation.x - relativeX,
+          y: ladderAnimation.y - moveOffset,
+        }
+        animationsList.push(adjustedForStart)
+      } else {
+        animationsList.push(ladderAnimation)
+      }
     }
 
     if (snake) {

diff --git a/src/pages/rules/components/DonaterRules.tsx b/src/pages/rules/components/DonaterRules.tsx
@@ -103,10 +103,11 @@ export default function DonaterRules() {
                   borderRadius: '15px',
                   paddingLeft: '20px',
                   paddingRight: '20px',
-                  paddingBottom: '5px',
+                  paddingTop: '8px',
+                  paddingBottom: '8px',
                 }}
               >
-                <Typography fontSize={'24px'} fontWeight={600}>
+                <Typography fontSize={'24px'} fontWeight={600} lineHeight={1.2}>
                   {rule.title}
                 </Typography>
               </AccordionSummary>
@@ -124,7 +125,6 @@ export default function DonaterRules() {
                     <Box marginLeft={2} marginBottom={2}>
                       {content.title}
                       {':'}
-
                       <Box marginTop={1} />
                       {content.special ? (
                         <ul>