From 2139704c1b030035cc637bd9b3ac5dc3d0dd76ce Mon Sep 17 00:00:00 2001 From: masuyama13 Date: Mon, 25 Aug 2025 16:54:08 -0700 Subject: [PATCH 1/2] Create footer --- public/logo.png | Bin 0 -> 6566 bytes src/assets/instagram-icon.svg | 12 ++++ src/assets/linkedin-icon.svg | 10 +++ src/assets/youtube-icon.svg | 3 + src/components/Footer.tsx | 106 ++++++++++++++++++++++++++----- src/styles/components/footer.css | 97 ++++++++++++++++++++++++++++ src/styles/foundations/reset.css | 2 +- src/styles/index.css | 4 ++ 8 files changed, 218 insertions(+), 16 deletions(-) create mode 100644 public/logo.png create mode 100644 src/assets/instagram-icon.svg create mode 100644 src/assets/linkedin-icon.svg create mode 100644 src/assets/youtube-icon.svg create mode 100644 src/styles/components/footer.css diff --git a/public/logo.png b/public/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..acbe491f2588875a5ed59363c16194cd1c40c170 GIT binary patch literal 6566 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 literal 0 HcmV?d00001 diff --git a/src/assets/instagram-icon.svg b/src/assets/instagram-icon.svg new file mode 100644 index 0000000..d9a9e13 --- /dev/null +++ b/src/assets/instagram-icon.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/assets/linkedin-icon.svg b/src/assets/linkedin-icon.svg new file mode 100644 index 0000000..40dd28c --- /dev/null +++ b/src/assets/linkedin-icon.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/assets/youtube-icon.svg b/src/assets/youtube-icon.svg new file mode 100644 index 0000000..936d073 --- /dev/null +++ b/src/assets/youtube-icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx index f5308c2..50587be 100644 --- a/src/components/Footer.tsx +++ b/src/components/Footer.tsx @@ -1,23 +1,99 @@ import React from 'react'; +import '../styles/components/footer.css'; function Footer() { return (
-
-

CherryOnTech

-

Land Acknowledgement

-

- We acknowledge that the work of CherryOnTech takes place on the traditional, stolen, and - ancestral lands of Indigenous Peoples across Turtle Island, known today as Canada and the - United States. We honour the original caretakers of these lands and recognize their - enduring connection to them. As we build inclusive tech spaces, we commit to learning - from Indigenous ways of knowing, being, and relating. -

-

We are a Canadian Register Non-Profit

-
    -
  • Incorporation Number: S0081556
    • -
  • Business Number: 79742 6962 BC0001
    • -
+
+ + Organization Logo + + +
+
+
+

Land Acknowledgement

+

+ We acknowledge that the work of CherryOnTech takes place on the traditional, stolen, and + ancestral lands of Indigenous Peoples across Turtle Island, known today as Canada and the + United States. We honour the original caretakers of these lands and recognize their + enduring connection to them. As we build inclusive tech spaces, we commit to learning + from Indigenous ways of knowing, being, and relating. +

+
+
+

We are a Canadian Registered Non-Profit

+
    +
  • Incorporation Number: S0081556
    • +
  • Business Number: 79742 6962 BC0001
    • +
+
+
+ + +
); diff --git a/src/styles/components/footer.css b/src/styles/components/footer.css new file mode 100644 index 0000000..d34868c --- /dev/null +++ b/src/styles/components/footer.css @@ -0,0 +1,97 @@ +footer { + background-color: var(--brand-blue); + color: var(--white); + position: sticky; + top: 100vh; + padding: 96px 80px; +} + +.footer-container { + text-align: center; +} + +img.footer-logo { + width: 180px; + height: 72px; + margin-bottom: 32px; + margin-left: auto; + margin-right: auto; +} + +.footer-headings { + margin-top: 16px; + margin-bottom: 8px; +} + +.social-icons-container { + margin-left: auto; + margin-right: auto; +} + +.column2 { + display: flex; + flex-direction: column; + justify-content: space-between; + gap: 16px; +} + +ul.footer-list { + list-style: none; + padding: 0; + margin: 0; +} + +ul.social-icons { + list-style: none; + padding: 0; + margin: 0; + display: flex; + gap: 24px; +} + +/* Tablet */ +@media (min-width: 429px) { + footer { + padding: 96px 32px; + } + + img.footer-logo { + width: 280px; + height: 112px; + margin: 0; + } + + .footer-container { + text-align: left; + } + + .social-icons-container { + margin: 0; + } +} + +/* Desktop */ +@media (min-width: 1280px) { + footer { + padding: 96px 112px; + } + + .footer-contents { + display: flex; + justify-content: space-between; + gap: 32px; + } + + .column1 { + max-width: 800px; + } + + .column2 { + display: flex; + flex-direction: column; + justify-content: space-between; + gap: 16px; + text-align: end; + align-items: flex-end; + } +} diff --git a/src/styles/foundations/reset.css b/src/styles/foundations/reset.css index c760f47..a6501de 100644 --- a/src/styles/foundations/reset.css +++ b/src/styles/foundations/reset.css @@ -18,7 +18,7 @@ html { /* Remove default margin in favour of better control in authored CSS */ body, h1, h2, h3, h4, p, figure, blockquote, dl, dd { - margin-block-end: 0; + margin: 0; } /* Remove list styles on ul, ol elements with a list role, which suggests default styling will be removed */ diff --git a/src/styles/index.css b/src/styles/index.css index 15c03c1..4626ade 100644 --- a/src/styles/index.css +++ b/src/styles/index.css @@ -2,3 +2,7 @@ @import './foundations/colors.css'; @import './foundations/typography.css'; @import './components/buttons.css'; + +* { + font-family: 'Lato', sans-serif; +} From 9fd04c4747f8dc7a34aa5c59f4a8fe1034d3393c Mon Sep 17 00:00:00 2001 From: masuyama13 Date: Tue, 26 Aug 2025 13:23:27 -0700 Subject: [PATCH 2/2] Update image paths to use absolute URLs --- src/components/Footer.tsx | 2 +- src/components/Header.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx index 50587be..0f8663d 100644 --- a/src/components/Footer.tsx +++ b/src/components/Footer.tsx @@ -6,7 +6,7 @@ function Footer() {