Skip to content

Commit

Permalink
Merge branch 'dev' into jsimj001/home-page-secondary-text
Browse files Browse the repository at this point in the history
  • Loading branch information
JSimjee authored Jan 28, 2025
2 parents 897bef3 + 7a6b1c8 commit ffa2b25
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 0 deletions.
Binary file added public/home/blurbforhome.webp
Binary file not shown.
Binary file added public/home/cupcakes.webp
Binary file not shown.
2 changes: 2 additions & 0 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import BlurbHome from "@/components/home/BlurbHome";
import MainText from "@/components/home/mainText";
import HomePage from "@/components/home/homepage";

Expand All @@ -6,6 +7,7 @@ const Home = () => {
<div>
<MainText />
<HomePage />
<BlurbHome />
</div>
);
};
Expand Down
27 changes: 27 additions & 0 deletions src/components/home/BlurbHome.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import Image from "next/image";
import Cupcakes from "@/public/home/cupcakes.webp";

const BlurbHome = () => {
return (
<div className="flex w-[30vw] flex-col items-center">
<div>
<Image
src={Cupcakes}
alt="12 Cupcakes on the table with two people sitting behind it"
className="h-[37vh] w-[20vw] rounded-[15%] border-2 border-cvdsa-cornflower-100"
/>
</div>

<p className="my-[1vh] text-[1.7vw] font-medium">Collaborations</p>

<p className="w-[18vw] text-center text-[0.9vw] font-light leading-tight">
We collaborate with various organizations, including SAGE and St. John
Ambulance (SJA) Canada. We plan to host campus-wide events and are
actively networking with other groups focused on cardiovascular disease
initiatives!
</p>
</div>
);
};

export default BlurbHome;

0 comments on commit ffa2b25

Please sign in to comment.