diff --git a/src/components/About.astro b/src/components/About.astro index 64666f4..1230344 100644 --- a/src/components/About.astro +++ b/src/components/About.astro @@ -1,10 +1,10 @@ --- import { Image } from 'astro:assets'; import working from '../graphics/about/working.webp'; -import crowdLarge from '../graphics/about/crowd-large.webp'; +import crowdLarge from '../graphics/about/crowd_large.webp'; import fourppl from '../graphics/about/fourppl.webp'; import bear from '../graphics/about/bear.webp'; -import annie from '../graphics/about/anniew.webp'; +import tools from '../graphics/about/tools.webp'; import crowd from '../graphics/about/crowd.webp'; --- @@ -26,13 +26,13 @@ import crowd from '../graphics/about/crowd.webp'; src={crowdLarge} alt="Large group of people coding at hackathon" /> - Picture of Calhacks members + Picture of CalHacks members Hackathon attendees posing with stuffed bear - Girl with tools + Girl with tools diff --git a/src/components/Contact.astro b/src/components/Contact.astro index a24e80c..c7ec4ab 100644 --- a/src/components/Contact.astro +++ b/src/components/Contact.astro @@ -1,30 +1,37 @@ -
+

CONTACT US

Any other 

questions?

-

We are here to help you! Please check the FAQ first; - If your question is not already answered, you can reach us at - .
-
- Please email - if you need a particular accommodation. - Note that requests made less than 24 hours before the event will likely not be accommodated. +

+ We are here to help you! Please check the FAQ first; If your question is not + already answered, you can reach us at + .
+
+ Please email + if you need a particular accommodation. Note that requests made less than 24 + hours before the event will likely not be accommodated.

\ No newline at end of file + diff --git a/src/components/FAQ.astro b/src/components/FAQ.astro index 94b07ae..4703848 100644 --- a/src/components/FAQ.astro +++ b/src/components/FAQ.astro @@ -73,9 +73,9 @@ const faqsCol1 = faqs.slice(0, split); const faqsCol2 = faqs.slice(split); --- -
+
-

FAQ

+

FAQ

Frequently asked questions – we've got the answers

@@ -101,13 +101,15 @@ const faqsCol2 = faqs.slice(split);
diff --git a/src/components/Header.astro b/src/components/Header.astro index e40810a..9c51a46 100644 --- a/src/components/Header.astro +++ b/src/components/Header.astro @@ -23,5 +23,7 @@ import Hero from './Hero.astro'; width: 100%; display: flex; flex-direction: column; + justify-content: center; + align-items: center; } diff --git a/src/components/Hero.astro b/src/components/Hero.astro index dd49087..956d081 100644 --- a/src/components/Hero.astro +++ b/src/components/Hero.astro @@ -26,10 +26,8 @@ import arrowsIcon from '../graphics/arrows.svg'; @calblueprint - @calblueprint - and @@ -37,9 +35,7 @@ import arrowsIcon from '../graphics/arrows.svg'; href="https://www.instagram.com/calhacks/" target="_blank" referrerpolicy="no-referrer" - > - @calhacks - + >@calhacks on Instagram for updates. @@ -70,6 +66,10 @@ import arrowsIcon from '../graphics/arrows.svg'; width: min-content; gap: 20px; } + + span > a:hover { + text-decoration-line: underline; + } } .btn-text { diff --git a/src/components/Navbar/style.module.scss b/src/components/Navbar/style.module.scss index c07e1d3..3084c86 100644 --- a/src/components/Navbar/style.module.scss +++ b/src/components/Navbar/style.module.scss @@ -2,10 +2,12 @@ @use '../../styles/breakpoints'; nav { + position: fixed; + top: 0; + display: flex; justify-content: space-between; align-items: center; - position: fixed; width: 100%; height: 4.5rem; padding: 8px 4.5rem; @@ -74,6 +76,10 @@ nav { .links a { color: colors.$text; + + h5:hover { + text-decoration-line: underline; + } } .mobileLinks { diff --git a/src/components/NonProfit.astro b/src/components/NonProfit.astro index 5536652..7f47a40 100644 --- a/src/components/NonProfit.astro +++ b/src/components/NonProfit.astro @@ -1,46 +1,87 @@ --- +interface Props { + name: string; + description: string; + image: string; + startColor: string; + endColor: string; + url?: string; +} + const { name, description, image, startColor, endColor, url } = Astro.props; --- - -

- {name} -

- {description} -
+ - \ No newline at end of file + + p { + font-weight: 400; + } + diff --git a/src/components/NonProfits.astro b/src/components/NonProfits.astro index 22b8120..ff458b2 100644 --- a/src/components/NonProfits.astro +++ b/src/components/NonProfits.astro @@ -2,56 +2,60 @@ import NonProfit from './NonProfit.astro'; --- -
-

NON-PROFITS

-

We’re a hackathon with social good at its heart.

+
+

NON-PROFITS

+

+ We’re a hackathon with social good at its heart. +

- Our nonprofits have presented several problem areas and projects to tackle their most pressing needs. Here are the incredible organizations that we’ve partnered with: + Our nonprofits have presented several problem areas and projects to tackle + their most pressing needs. Here are the incredible organizations that we’ve + partnered with:

- - - - - - @use '../styles/breakpoints'; @use '../styles/colors'; - + .lead { width: 100%; padding-left: 1rem; position: relative; - display: flex; + display: flex; flex-direction: column; gap: 16px; justify-content: center; text-align: center; color: colors.$text; - + padding-bottom: 2rem; + margin-top: 180px; + @media (min-width: breakpoints.$laptop) { - padding: 0 5rem 2rem 5rem; - grid-template-columns: 1fr 1fr 1fr; - max-width: 800px; - margin: auto; + padding: 0 20%; + padding-bottom: 80px; + grid-template-columns: 1fr 1fr 1fr; } } - + .emphasis { - font-family: "new-spirit", serif; + font-family: 'new-spirit', serif; font-weight: 600; } - .nonprofits { width: 100%; padding-left: 1rem; position: relative; - display: grid; - grid-template-columns: 1fr; + display: grid; + grid-template-rows: min-content; + grid-template-columns: 1fr; gap: 24px; @media (min-width: breakpoints.$laptop) { - padding: 0 5rem 5rem 5rem; - grid-template-columns: 1fr 1fr 1fr; + padding: 0 156px; + grid-template-columns: 1fr 1fr 1fr; } } - - #nonprofits { - margin-top: 180px; - } diff --git a/src/components/Schedule.astro b/src/components/Schedule.astro index 98db80e..9b041b1 100644 --- a/src/components/Schedule.astro +++ b/src/components/Schedule.astro @@ -1,6 +1,6 @@ -
+
-

SCHEDULE

+

SCHEDULE

1 day, but countless possibilities

From workshops to speaker events, we are dedicated to creating an @@ -71,7 +71,9 @@