Skip to content

Fix/more designer changes #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Sauvikesh merged 3 commits into from
Dec 8, 2024
Merged

Fix/more designer changes #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e7d5ce
style: moved title down, added About, fixed prize cost
Sauvikesh Dec 8, 2024
a3998b7
style: aligned arrow with text in nav, reduced size
Sauvikesh Dec 8, 2024
767ed8d
style: center aligned the numbers and text
Sauvikesh Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/(pages)/(index-page)/about-us/_components/Hello/Hello.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ $tablet-breakpoint: 768px;
z-index: 1;
padding-left: 12%;
padding-right: 48%;
margin-top: 10%;


@media (max-width: $tablet-breakpoint) {
Expand All @@ -41,6 +42,7 @@ $tablet-breakpoint: 768px;
font-weight: 700;
line-height: 111.5%; /* 122.755px */
letter-spacing: 2.202px;
width: 600px;
@media (max-width: $tablet-breakpoint) {
font-size: 48px;
}
Expand Down
2 changes: 1 addition & 1 deletion app/(pages)/(index-page)/about-us/_components/Hello/Hello.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const Hello = () => {
return (
<div className={styles.hello_container}>
<div className={styles.title}>
<h1>HackDavis</h1>
<h1>About HackDavis</h1>
<p>
Bringing together 750+ students, creators, and leaders to create for
social good
Expand Down
10 changes: 5 additions & 5 deletions app/(pages)/(index-page)/about-us/_components/Sponsor/Sponsor.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
.content {
display: flex;
justify-content: center;
align-items: center;
flex-direction: row;
margin: 88px 176px 0 176px;
height: 100%;
Expand All @@ -37,6 +38,7 @@
flex-direction: column;
justify-content: space-between;
width: 60%;
max-width: 450px;
height: 100%;
gap: 50px;

Expand Down Expand Up @@ -78,8 +80,7 @@
display: flex;
flex-direction: column;
align-items: center;
width: fit-content;
height: fit-content;
width: 40%;

@include mixins.phone {
width: 30%;
Expand All @@ -90,13 +91,12 @@
.number {
color: #123041;
font-family: "Metropolis";
font-size: 4rem;
font-size: 48px;
font-style: normal;
font-weight: 700;
line-height: 150%;
letter-spacing: 1.28px;
text-transform: lowercase;
margin-right: 24px;

@include mixins.phone {
font-size: 36px;
Expand All @@ -115,7 +115,7 @@
align-items: center;
color: #123041;
font-family: "Metropolis";
font-size: 1.75rem;
font-size: 24px;
font-style: normal;
font-weight: 500;
line-height: 150%;
Expand Down
2 changes: 1 addition & 1 deletion app/(pages)/(index-page)/about-us/_components/Sponsor/Sponsor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const images = [Polaroid1, Polaroid2, Polaroid3, Polaroid4, Polaroid5];
const hdStats = [
{ stat: 140, text: 'projects', duration: 1500 },
{ stat: 750, text: 'hackers', suffix: '+', duration: 1500 },
{ stat: 10, text: 'prizes', prefix: '$', suffix: 'k+', duration: 1500 },
{ stat: 15, text: 'prizes', prefix: '$', suffix: 'k+', duration: 1500 },
{ stat: 24, text: 'hours', duration: 1500 },
];

Expand Down
4 changes: 2 additions & 2 deletions app/(pages)/_components/Navbar/Navbar.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ $mobile-breakpoint: 425px;
}

.linkArrow {
width: 14px;
height: 14px;
width: 10px;
height: 10px;
}
}

Expand Down
6 changes: 3 additions & 3 deletions app/(pages)/_components/Navbar/Navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,13 @@ export default function Navbar({ navLinks }: { navLinks: NavLink[] }) {
{index !== navLinks.length - 1 && link.name}

{index === navLinks.length - 1 && (
<div className="tw-flex tw-gap-2">
<div className="tw-flex tw-items-center tw-gap-2">
{link.name}
<Image
src="/navbar/upRightArrow.png"
alt="link arrow"
width={14}
height={14}
width={100}
height={100}
className={styles.linkArrow}
/>
</div>
Expand Down
Loading