Skip to content

Commit

Permalink
Merge pull request #27 from mvhacks/noam-formatting-improvements
Browse files Browse the repository at this point in the history
Formatting Improvements
  • Loading branch information
emilymarkova authored Jan 19, 2025
2 parents a234c4f + 288ed74 commit e5524e4
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 21 deletions.
43 changes: 25 additions & 18 deletions src/components/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,15 @@ export default function Navbar({ onOptionSelect }: any) {
onClick={() => onOptionSelect("home")}
>
<Typography
id="mvhackstext"
sx={{
color: "white",
paddingLeft: "10%",
width: "100%",
marginRight: "auto",
}}
level="h1"
>
MVHacks 8.0
MVHacks&nbsp;8.0
</Typography>
</Link>
</Box>
Expand Down Expand Up @@ -279,7 +279,7 @@ export default function Navbar({ onOptionSelect }: any) {
justifyContent: "center",
"&:hover": {
backgroundColor: "black !important",
textDecoration:"none",
textDecoration: "none",
},
}}
>
Expand All @@ -292,7 +292,7 @@ export default function Navbar({ onOptionSelect }: any) {
}}
level="h4"
>
Apply
Alert
</Typography>
</Link>
</List>
Expand Down Expand Up @@ -387,11 +387,12 @@ export default function Navbar({ onOptionSelect }: any) {
backgroundColor: "transparent",
},
}}
href="https://docs.google.com/forms/d/e/1FAIpQLSefTr6730BXSMYYdAnDXS5hFu_NZ5FHyzNYkv2MYqZoxvkgyQ/viewform"
component="button"
color="neutral"
level="h3"
underline="none"
variant="plain"
onClick={() => onOptionSelect("info")}
>
<Typography
sx={{
Expand All @@ -402,7 +403,7 @@ export default function Navbar({ onOptionSelect }: any) {
}}
level="h3"
>
Apply
Info
</Typography>
</Link>
<Link
Expand All @@ -417,7 +418,7 @@ export default function Navbar({ onOptionSelect }: any) {
level="h3"
underline="none"
variant="plain"
onClick={() => onOptionSelect("info")}
onClick={() => onOptionSelect("schedule")}
>
<Typography
sx={{
Expand All @@ -428,7 +429,7 @@ export default function Navbar({ onOptionSelect }: any) {
}}
level="h3"
>
Info
Schedule
</Typography>
</Link>
<Link
Expand All @@ -443,7 +444,7 @@ export default function Navbar({ onOptionSelect }: any) {
level="h3"
underline="none"
variant="plain"
onClick={() => onOptionSelect("schedule")}
onClick={() => onOptionSelect("faqs")}
>
<Typography
sx={{
Expand All @@ -454,7 +455,7 @@ export default function Navbar({ onOptionSelect }: any) {
}}
level="h3"
>
Schedule
Faqs
</Typography>
</Link>
<Link
Expand All @@ -469,7 +470,7 @@ export default function Navbar({ onOptionSelect }: any) {
level="h3"
underline="none"
variant="plain"
onClick={() => onOptionSelect("faqs")}
onClick={() => onOptionSelect("sponsor")}
>
<Typography
sx={{
Expand All @@ -480,7 +481,7 @@ export default function Navbar({ onOptionSelect }: any) {
}}
level="h3"
>
Faqs
Sponsors
</Typography>
</Link>
<Link
Expand All @@ -495,7 +496,7 @@ export default function Navbar({ onOptionSelect }: any) {
level="h3"
underline="none"
variant="plain"
onClick={() => onOptionSelect("sponsor")}
onClick={() => onOptionSelect("team")}
>
<Typography
sx={{
Expand All @@ -506,22 +507,28 @@ export default function Navbar({ onOptionSelect }: any) {
}}
level="h3"
>
Sponsors
Team
</Typography>
</Link>
<Link
style={{ margin: 10, color: "white", paddingLeft: 10 }}
style={{
margin: 10,
color: "white",
paddingLeft: 10,
border: "2px solid white",
borderRadius: "5px",
}}
sx={{
"&:hover": {
backgroundColor: "transparent",
borderColor: "rgb(200,172,212)",
},
}}
component="button"
href="https://docs.google.com/forms/d/e/1FAIpQLSefTr6730BXSMYYdAnDXS5hFu_NZ5FHyzNYkv2MYqZoxvkgyQ/viewform"
color="neutral"
level="h3"
underline="none"
variant="plain"
onClick={() => onOptionSelect("team")}
>
<Typography
sx={{
Expand All @@ -532,7 +539,7 @@ export default function Navbar({ onOptionSelect }: any) {
}}
level="h3"
>
Team
Alert
</Typography>
</Link>
</Box>
Expand Down
3 changes: 1 addition & 2 deletions src/components/Team.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ const tech = [
const outreach = [
addPerson('Saahiti Bondalapati', 'https://i.imgur.com/16sqDdo.png', 'Outreach Director', '[email protected]', 'Email'),
addPerson('Rohin Gupta', blank, 'Member', '[email protected]','Email'),
addPerson('Nikita Narrang', 'https://i.imgur.com/QC4s8O0.jpeg', 'Member', '[email protected]','Email'),
addPerson('Ishaan Sharma', blank, 'Member', '[email protected]','Email'),
addPerson('Nikita Narang', 'https://i.imgur.com/QC4s8O0.jpeg', 'Member', '[email protected]','Email'),
addPerson('Mirabel Wang', blank, 'Member', '[email protected]','Email')
];

Expand Down
4 changes: 3 additions & 1 deletion src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ code {
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
monospace;
}

#mvhackstext {
font-size: clamp(16px, 5vw, 2.25rem);
}
#footer {
text-align: center;
}
Expand Down

0 comments on commit e5524e4

Please sign in to comment.