Skip to content

Commit

Permalink
color changes
Browse files Browse the repository at this point in the history
  • Loading branch information
michelleyeoh committed Dec 5, 2024
1 parent 1c84da4 commit fb356d5
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 17 deletions.
4 changes: 2 additions & 2 deletions app/(pages)/(about-us)/_components/hero/heroStats.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
align-items: center;
justify-content: center;

// background: #E5C28E; //temp background to see text
// background: #E5C28E; //temp background to see text
padding-left: 10%;
padding-right: 10%;
overflow: hidden;
Expand Down Expand Up @@ -40,7 +40,7 @@
// }

h1{
color: #005271;
color: #B38F5A;
font-family: "Metropolis";
font-size: 64px;
font-style: normal;
Expand Down
2 changes: 1 addition & 1 deletion app/(pages)/(about-us)/_components/hero/heroStats.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import CountUp from '@components/CountUp/CountUp';

const statsData = [
{ stat: 750, text: 'HACKERS', suffix: '+', duration: 2000 },
{ stat: 24, text: 'HOURS', duration: 2000 },
{ stat: 150, text: 'PROJECTS', suffix: '+', duration: 2000 },
{ stat: 15, text: 'PRIZES', prefix: '$', suffix: 'k+', duration: 2000 },
{ stat: 24, text: 'HOURS', duration: 2000 },
];

export default function HeroStats() {
Expand Down
4 changes: 3 additions & 1 deletion app/(pages)/(about-us)/_components/hero/heroText.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
font-size: 128px;
font-style: normal;
font-weight: 800;
line-height: 102%; /* 130.56px */
letter-spacing: -3.84px;
}
h2 {
color: #FFF;
Expand All @@ -25,7 +27,7 @@
font-family: 'Metropolis';
font-size: 32px;
font-style: normal;
font-weight: 400;
font-weight: 600;
line-height: 150%; /* 48px */
letter-spacing: 0.64px;
}
Expand Down
20 changes: 12 additions & 8 deletions app/(pages)/(about-us)/_components/hero/heroText.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@
import styles from './heroText.module.scss';

export default function HeroText() {
return (
<div className={styles.container}>
<h2>HELLO, WE'RE</h2>
<h1>HackDavis</h1>
<p>Bringing together the most talented students <br/> and leaders to create for social good</p>
</div>
);
}
return (
<div className={styles.container}>
<h2>HELLO, WE'RE</h2>
<br />
<h1>HackDavis</h1>
<p>
Bringing together the most talented students <br /> and leaders to
create for social good
</p>
</div>
);
}
10 changes: 5 additions & 5 deletions app/(pages)/(about-us)/about-us/page.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import HeroStats from "../_components/hero/heroStats";
import HeroText from "../_components/hero/heroText";
import HeroStats from '../_components/hero/heroStats';
import HeroText from '../_components/hero/heroText';

export default function AboutUs() {
return (
<div>
<div style={{margin:'500px'}}>Halo this is the about us page!</div>
<HeroText/>
<HeroStats/>
<div style={{ margin: '500px' }}>Halo this is the about us page!</div>
<HeroText />
<HeroStats />
</div>
);
}

0 comments on commit fb356d5

Please sign in to comment.