Merge pull request #488 from Magickbase/develop

Magickbase · Aug 23, 2022 · 2fe8dfd · 2fe8dfd · vercel · Aug 23, 2022
2 parents ca319ae + 843e4b4
commit 2fe8dfd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/components/Header.tsx b/components/Header.tsx
@@ -76,7 +76,7 @@ const AccordionDetails = styled(MuiAccordionDetails)(({ theme }) => ({
   },
 }))
 
-const StyledMenu = styled((props: MenuProps) => <HoverMenu {...props} />)(({ theme }) => ({
+const StyledMenu = styled((props: MenuProps) => <HoverMenu disableScrollLock={true} {...props} />)(({ theme }) => ({
   '& .MuiPaper-root': {
     borderRadius: theme.spacing(1),
     boxShadow: `0px 4px 9px ${theme.palette.primary.light}`,

diff --git a/pages/index.tsx b/pages/index.tsx
@@ -636,10 +636,10 @@ const Home = () => {
   return (
     <Box sx={{ pb: { xs: 5, md: 11 } }}>
       <Box sx={{ bgcolor: 'primary.light' }}>
-        <Container sx={{ px: { md: 3, lg: 1 } }}>
+        <Container sx={{ px: { md: 3, lg: 0 } }}>
           <Search />
         </Container>
-        <Container sx={{ px: { md: 3, lg: 1 }, pr: { xs: 0 } }}>
+        <Container sx={{ px: { md: 3, lg: 0 }, pr: { xs: 0 } }}>
           <Stack
             direction="row"
             sx={{ pt: 2.5, pb: 1, overflow: 'hidden' }}
@@ -670,7 +670,7 @@ const Home = () => {
           </Stack>
         </Container>
       </Box>
-      <Container sx={{ px: { md: 2, lg: 1 } }}>
+      <Container sx={{ px: { md: 2, lg: 0 } }}>
         <Stack
           direction={{ xs: 'column', sm: 'column', md: 'column', lg: 'row' }}
           spacing={4}

diff --git a/styles/globals.scss b/styles/globals.scss
@@ -15,6 +15,11 @@
   --amount-frac-color: #938dac;
 }
 
+html {
+  overflow-x: hidden;
+  width: 100vw;
+}
+
 html,
 body {
   font-size: 16px;