diff --git a/app/(pages)/about-us/_components/Archives/Archives.tsx b/app/(pages)/about-us/_components/Archives/Archives.tsx index 6594c4d..57f3536 100644 --- a/app/(pages)/about-us/_components/Archives/Archives.tsx +++ b/app/(pages)/about-us/_components/Archives/Archives.tsx @@ -85,9 +85,11 @@ export default function Archives() { return (
-
-

From the archive

-
+
+

+ From the archive +

+
diff --git a/app/(pages)/about-us/_components/CelebrateWrapper/CelebrateWrapper.tsx b/app/(pages)/about-us/_components/CelebrateWrapper/CelebrateWrapper.tsx index 4ea3de8..a8b44fc 100644 --- a/app/(pages)/about-us/_components/CelebrateWrapper/CelebrateWrapper.tsx +++ b/app/(pages)/about-us/_components/CelebrateWrapper/CelebrateWrapper.tsx @@ -4,11 +4,11 @@ export default function CelebrateWrapper({ children: React.ReactNode; }) { return ( -
+
-
+
-

Celebrate our past with us!

+

Celebrate our past with us!

We could not have done any of this without you. Your support means diff --git a/app/(pages)/about-us/_components/CloudBackground/CloudBackground.module.scss b/app/(pages)/about-us/_components/CloudBackground/CloudBackground.module.scss index 90565e4..ab74b1c 100644 --- a/app/(pages)/about-us/_components/CloudBackground/CloudBackground.module.scss +++ b/app/(pages)/about-us/_components/CloudBackground/CloudBackground.module.scss @@ -1,28 +1,5 @@ @import '@globals/styles/mixins.scss'; -// @include desktop { -// .container { -// background-image: -// url('/images/cloud_background/TopClouds.svg'), -// linear-gradient(to bottom, var(--sky-background) 0%, #D5FCD1 100%); -// background-repeat: no-repeat; -// background-size: contain; -// background-position: top center; -// padding-top: 15%; -// padding-bottom: 5%; -// display: flex; -// align-items: stretch; -// height: 100vh; /* Full screen height */ -// width: 100%; - -// .child1, .child2 { -// width: 50%; -// position: relative; /* Required for Next.js Image fill */ -// border: 3px solid black; -// } -// } -// } - .container { background-image: url('/images/cloud_background/TopClouds.svg'), @@ -35,8 +12,9 @@ padding-bottom: 75%; display: flex; align-items: stretch; - height: 100vh; /* Full screen height */ + height: 1976px; /* Full screen height */ width: 100%; + position: relative; .child1 { background-image: url('/images/cloud_background/LeftClouds.svg'); diff --git a/app/(pages)/about-us/_components/CloudBackground/CloudBackground.tsx b/app/(pages)/about-us/_components/CloudBackground/CloudBackground.tsx index d8feb47..21b3904 100644 --- a/app/(pages)/about-us/_components/CloudBackground/CloudBackground.tsx +++ b/app/(pages)/about-us/_components/CloudBackground/CloudBackground.tsx @@ -1,11 +1,16 @@ import styles from './CloudBackground.module.scss'; // import Image from 'next/image'; -export default function CloudBackground() { +export default function CloudBackground({ + children, +}: { + children: React.ReactNode; +}) { return (

+
{children}
); } diff --git a/app/(pages)/about-us/_components/Recap/Recap.tsx b/app/(pages)/about-us/_components/Recap/Recap.tsx index c69e136..40c2954 100644 --- a/app/(pages)/about-us/_components/Recap/Recap.tsx +++ b/app/(pages)/about-us/_components/Recap/Recap.tsx @@ -3,10 +3,10 @@ import RecapAwards from './recap_awards'; export default function Recap() { return ( -
+
-
-

HackDavis 2024 Recap

+
+

HackDavis 2024 Recap

diff --git a/app/(pages)/about-us/_components/Recap/recap_awards.tsx b/app/(pages)/about-us/_components/Recap/recap_awards.tsx index a2d1245..c389cfe 100644 --- a/app/(pages)/about-us/_components/Recap/recap_awards.tsx +++ b/app/(pages)/about-us/_components/Recap/recap_awards.tsx @@ -3,7 +3,7 @@ import trophies_image from '@public/images/recap/trophies.svg'; export default function RecapAwards() { return ( -
+
trophies - VIEW 2024 WINNERS + VIEW 2024 WINNERS
); diff --git a/app/(pages)/about-us/page.tsx b/app/(pages)/about-us/page.tsx index 6376c36..39d675d 100644 --- a/app/(pages)/about-us/page.tsx +++ b/app/(pages)/about-us/page.tsx @@ -4,19 +4,19 @@ import OurTeam from './_components/OurTeam/OurTeam'; import Archives from './_components/Archives/Archives'; import CelebrateWrapper from './_components/CelebrateWrapper/CelebrateWrapper'; import Recap from './_components/Recap/Recap'; - +import CloudBackground from './_components/CloudBackground/CloudBackground'; export default function AboutUs() { return (
-
+ -
+
); }