Merge branch 'main' of https://github.com/Scott170c/Hacky-Holidays

Scott170c · Nov 29, 2024 · 1aa57ba · 1aa57ba
2 parents 7f65634 + 653b944
commit 1aa57ba
Show file tree

Hide file tree

Showing 5 changed files with 3,383 additions and 64 deletions.
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+legacy-peer-deps=true
diff --git a/app/page.tsx b/app/page.tsx
@@ -12,11 +12,10 @@ import {
   Box,
   Button,
   Image,
-
   Grid,
   Heading,
   Text,
-} from 'theme-ui'
+} from 'theme-ui';
 import dynamic from 'next/dynamic';
 
 // const ModelViewer = dynamic(() => import('./ModelViewer'), { ssr: false });
@@ -34,7 +33,7 @@ export default function Home() {
 
   return (
   <Grid gap = {0} sx={{
-    backgroundImage: 'linear-gradient(to bottom, #3EB2FF, #FFFFFF)', 
+    backgroundImage: 'linear-gradient(to bottom, #25A8FF, #DCF1FF)', 
 
   }}>   
 
@@ -148,7 +147,7 @@ export default function Home() {
             <Heading as="h1" variant="styles.h1" 
                   sx={{ 
                     fontFamily: 'var(--font-inter)', 
-                    fontSize: '6rem', 
+                    fontSize: '7rem', 
                     fontWeight:900,
                     textAlign: ['center','center','left']
 
@@ -171,7 +170,7 @@ export default function Home() {
               fontSize: '1.5rem',
               fontWeight: 900,
               color: 'white',
-              bg: '#FF8585',
+              bg: '#f90b0b',
               width: 'fit-content',
               borderRadius: '1rem',
               padding: '1rem 2rem',
@@ -219,7 +218,7 @@ export default function Home() {
                 justifyContent: 'center',
                 flexDirection: 'row',
                 alignItems: 'center',
-                backgroundColor: '#FFFFFF42',
+                backgroundColor: 'rgba(255, 255, 255, 40%)',
                 borderRadius: '32px',
                 mx: '32px',
                 paddingBottom: '2vh',
@@ -230,16 +229,19 @@ export default function Home() {
                     justifyContent: 'center',
                     display: 'flex',
                     flexDirection: 'column',
+                    paddingTop: '2rem'
                   }}>
                     <Heading as="h4"   sx={{
-
                       fontFamily: 'var(--font-inter)',
                       fontWeight: 900,
+                      fontSize: '1.5vw',
+                      paddingBottom: '1.2rem'
                     } }>Design a Decoration</Heading>
                     <Image sx={{
                       width:'30rem',
                       height:'30rem',
                       borderRadius: '16px',
+                      paddingBottom: '3rem'
                     }}></Image>
 
                   </Box>
@@ -260,25 +262,31 @@ export default function Home() {
                       width:'30rem',
                       height:'30rem',
                       borderRadius: '16px',
+                      paddingBottom: '2.5rem'
                     }}></Image>
                   </Box>
                   <Box sx={{
                     alignItems: 'center',
                     justifyContent: 'center',
                     display: 'flex',
                     flexDirection: 'column',
+                    paddingTop: '2rem'
                   }}>
                   <Heading as="h4"   sx={{
                       fontFamily: 'var(--font-inter)',
                       fontWeight: 900,
+                      fontSize: '1.5vw',
+                      paddingBottom: '1.2rem'
                     } }>Submit a PR</Heading>
                        <Image sx={{
                       width:'30rem',
                       height:'30rem',
                       borderRadius: '16px',
+                      paddingBottom: '2.5rem'
                     }}></Image>
                   </Box>
               </Grid>
+            <Box sx={{height: '100vh'}}>
               <Heading as = "h3" sx={{
                 textAlign: 'left',
                 fontFamily: 'var(--font-inter)',
@@ -295,7 +303,7 @@ export default function Home() {
                 ml: '4vh'
               }}>
                 - Must be a student in high school or below </Text>
-              
+          </Box>
           </Box>
           <Box sx={{
             backgroundColor: '#FFA5A5',