Skip to content

Commit e3e4520

Browse files
emilymarkovaemilymarkova
authored
Merge pull request #30 from mvhacks/main-page-updates
Making style adjustments
2 parents e104b4f + 35e693e commit e3e4520

File tree

4 files changed

+29
-28
lines changed

4 files changed

+29
-28
lines changed

‎package-lock.json

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"@types/node": "^16.18.113",
1717
"@types/react": "^18.3.11",
1818
"@types/react-dom": "^18.3.1",
19-
"framer-motion": "^11.17.0",
19+
"framer-motion": "^11.18.2",
2020
"react": "^18.3.1",
2121
"react-dom": "^18.3.1",
2222
"react-multi-carousel": "^2.8.5",

‎src/components/InfoPage.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ export default function InfoPage() {
2222
}, []);
2323
return (
2424
<div>
25-
{!isMobile && (<div style={{marginTop: "100px"}}>
25+
{!isMobile && (<div style={{marginTop: "50px"}}>
2626
<motion.div
2727
initial={{ opacity: 0, y: 50}}
28-
whileInView={{ opacity: 1, y: 0, transition: { delay: 0.2, duration: 0.5}}}
28+
whileInView={{ opacity: 1, y: 0, transition: { delay: 0.3, duration: 0.7}}}
2929
viewport={{ once: true, amount: 1 }}
3030
>
3131
<Card
@@ -49,7 +49,7 @@ export default function InfoPage() {
4949
</motion.div>
5050
<motion.div
5151
initial={{ opacity: 0, y: 50}}
52-
whileInView={{ opacity: 1, y: 0, transition: { delay: 0.2, duration: 0.5}}}
52+
whileInView={{ opacity: 1, y: 0, transition: { delay: 0.3, duration: 0.7}}}
5353
viewport={{ once: true, amount: 1 }}
5454
>
5555
<Card
@@ -74,7 +74,7 @@ export default function InfoPage() {
7474
</motion.div>
7575
<motion.div
7676
initial={{ opacity: 0, y: 50}}
77-
whileInView={{ opacity: 1, y: 0, transition: { delay: 0.2, duration: 0.5}}}
77+
whileInView={{ opacity: 1, y: 0, transition: { delay: 0.3, duration: 0.7}}}
7878
viewport={{ once: true, amount: 1 }}
7979
>
8080
<Card
@@ -100,10 +100,10 @@ export default function InfoPage() {
100100
</Card>
101101
</motion.div>
102102
</div>)}
103-
{isMobile && (<div style={{marginTop: "100px"}}>
103+
{isMobile && (<div style={{marginTop: "50px"}}>
104104
<motion.div
105105
initial={{ opacity: 0, y: 50}}
106-
whileInView={{ opacity: 1, y: 0, transition: { delay: 0.2, duration: 0.5}}}
106+
whileInView={{ opacity: 1, y: 0, transition: { delay: 0.3, duration: 0.7}}}
107107
viewport={{ once: true, amount: 1 }}
108108
>
109109
<Card
@@ -127,7 +127,7 @@ export default function InfoPage() {
127127
</motion.div>
128128
<motion.div
129129
initial={{ opacity: 0, y: 50}}
130-
whileInView={{ opacity: 1, y: 0, transition: { delay: 0.2, duration: 0.5}}}
130+
whileInView={{ opacity: 1, y: 0, transition: { delay: 0.3, duration: 0.7}}}
131131
viewport={{ once: true, amount: 1 }}
132132
>
133133
<Card
@@ -151,7 +151,7 @@ export default function InfoPage() {
151151
</motion.div>
152152
<motion.div
153153
initial={{ opacity: 0, y: 50}}
154-
whileInView={{ opacity: 1, y: 0, transition: { delay: 0.2, duration: 0.5}}}
154+
whileInView={{ opacity: 1, y: 0, transition: { delay: 0.3, duration: 0.7}}}
155155
viewport={{ once: true, amount: 1 }}
156156
>
157157
<Card

‎src/components/Title.tsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export default function Title() {
1414
<Typography
1515
level="h1"
1616
textColor="common.white"
17-
sx={{ fontWeight: "bold", fontSize: { xs: "12vw", sm: "10vw", md: "9vw", lg: "7vw" }, marginLeft: "10%", lineHeight: "80%", marginTop: "1%"}}
17+
sx={{ fontWeight: "bold", fontSize: { xs: "12vw", sm: "10vw", md: "9vw", lg: "7vw" }, marginLeft: "10%", lineHeight: "80%", marginTop: "7%"}}
1818
>
1919
MV HACKS
2020
<br />
@@ -24,12 +24,13 @@ export default function Title() {
2424

2525
<div id="subtitle">
2626
<Typography
27-
level="h3"
27+
level="title-lg"
2828
textColor="common.white"
2929
sx={{
3030
fontWeight: "normal",
3131
marginLeft: "10%",
3232
fontSize: {xs: "6vw", sm: "4vw", md: "3vw", lg: "1.65vw"},
33+
marginTop: "2%",
3334
marginBottom: "1%",
3435
}}
3536
>
@@ -42,11 +43,11 @@ export default function Title() {
4243
<img
4344
alt="circle"
4445
src={`${circle}?refresh=${random}`}
45-
style={{ position: "absolute", width: "110%", height: "160%", left: "-5%", top: "-25%"}}
46+
style={{ position: "absolute", width: "120%", height: "170%", left: "-7%", top: "-25%"}}
4647
/>
4748

4849
<Typography
49-
level="h3"
50+
level="title-lg"
5051
textColor="common.white"
5152
sx={{ fontWeight: "normal", fontSize: {xs: "6vw", sm: "4vw", md: "3vw", lg: "1.65vw"} }}
5253
>
@@ -58,14 +59,14 @@ export default function Title() {
5859
level="body-lg"
5960
variant="plain"
6061
textColor="common.white"
61-
sx={{maxWidth: "500px", marginLeft: "10%", marginRight: "10%", marginBottom:"20px", marginTop: "10px", fontSize: {xs: "4vw", sm: "4vw", md: "3vw", lg: "1.25vw"} }}
62+
sx={{maxWidth: "1000px", marginLeft: "10%", marginRight: "10%", marginBottom:"20px", marginTop: "2%", fontSize: {xs: "3vw", sm: "2vw", md: "2vw", lg: "1.25vw"} }}
6263
>
6364
Each year, high school hackers from across the Bay Area come together at MVHacks to create cool projects, learn from experts, and participate in 12 hours of hacking! Hackers of all skill levels are welcome to compete, individually or as a group.
6465
The date and time of this event are not finalized yet, but will be in Spring 2025 in the Bay Area.
6566
<Typography
6667
level="title-lg"
6768
variant="plain"
68-
sx={{color: "rgb(150,122,162)", fontSize: {xs: "4vw", sm: "4vw", md: "3vw", lg: "1.25vw"}}}
69+
sx={{color: "rgb(150,122,162)", fontSize: {xs: "3vw", sm: "2vw", md: "2vw", lg: "1.25vw"}}}
6970
>
7071
*You can now sign up to be alerted when more details about MVHacks 8.0 are released by clicking the alert me button.</Typography>{' '}
7172
</Typography>

0 commit comments

Comments
 (0)