Skip to content

Commit

Permalink
feat: update about page (#64)
Browse files Browse the repository at this point in the history
  • Loading branch information
KevinWu098 authored Mar 29, 2024
1 parent 13f60d2 commit 6691a5f
Show file tree
Hide file tree
Showing 15 changed files with 452 additions and 65 deletions.
13 changes: 8 additions & 5 deletions src/app/controllers/useScroll.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,14 @@ function useScroll() {
}, [scrollableElements]);

useEffect(() => {
window.scrollTo({
top: 0,
left: 0,
behavior: "smooth",
});
if (!pathname.includes("beta")) {
window.scrollTo({
top: 0,
left: 0,
behavior: "smooth",
});
}

setScrollableElements(document.getElementsByClassName("wait"));
window.addEventListener("scroll", pageScroll);
pageScroll();
Expand Down
28 changes: 2 additions & 26 deletions src/app/pages/Designathons/Designathon24/Designathon24.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import FOF from "./assets/FOF.png";
import notion from "./assets/notion.png";
import balsamiq from "./assets/balsamiq.png";
import {
About,
Profile,
Prizes,
SectionNavigation,
Expand Down Expand Up @@ -48,32 +49,7 @@ const Designathon24 = () => (
<SectionNavigation />
<WinnerShowcase winners={WINNERS_2024} />

<div className={cn.about} id="s-about">
<Section>
<h2 className={cn.aboutHeading}>About</h2>
<p>
Design-a-thon is a 3 day long hybrid event where you or a team design
a product focused on the theme: community and inclusivity. It takes
place on February 24, starting at 5:30 pm and ends February 26, 8:00
pm PST.
</p>
<p>
Design at UCI is the premier student-run organization at UCI for
anything graphic design, UI/UX design, product design, and more.
Started in 2016, we foster a special community for all digital
designers to connect, learn, and innovate.
</p>
<p>
Design at UCI’s designathon is the largest collegiate designathon in
Orange County. Each year, we bring together hundreds of student
designers nationwide to define, develop, and pitch a product built
from scratch. We hope that this experience can help you acquire and
grow both your soft and hard skills in empathizing with your users,
defining a set of goals and needs, developing your product, and
improving your confidence and creativity as a human-centric designer.
</p>
</Section>
</div>
<About />

<div className={cn.people} id="s-people">
<Section>
Expand Down
34 changes: 0 additions & 34 deletions src/app/pages/Designathons/Designathon24/Designathon24.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -42,40 +42,6 @@
}
}

& > .about {
padding: 10px;
background-color: var(--des24-cream);
color: var(--des24-black);
font-size: 1em;

& h2 {
font-size: 2em;
font-weight: bold;
}

& p {
font-size: 1.2em;
line-height: 1.5em;
}

& .aboutHeading {
color: var(--des24-hot-pink);
}

@media screen and (min-width: 1100px) {
padding-bottom: 80px;

& h2 {
font-size: 3em;
}

& p {
font-size: 1.3em;
line-height: 1.4em;
}
}
}

& > .prizes {
background-color: white;
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 6691a5f

Please sign in to comment.