From 2a88f21ff5d87c9732e12f9bc677792454c2f2ec Mon Sep 17 00:00:00 2001 From: Jinkang Fang <67077248+jinkang-0@users.noreply.github.com> Date: Sun, 11 Feb 2024 12:42:47 -0800 Subject: [PATCH 1/2] update hero text, remove registration button --- src/components/Button.astro | 12 +++++++----- src/components/Hero.astro | 11 +++++------ src/components/Navbar/index.tsx | 5 ----- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/components/Button.astro b/src/components/Button.astro index 4424c83..46400bd 100644 --- a/src/components/Button.astro +++ b/src/components/Button.astro @@ -57,12 +57,14 @@ if (variant === 'menu') classes.push('menu'); a.primary { background-color: colors.$primary; - &:hover { - background-color: $primary-hover; - } + &:not(.disabled) { + &:hover { + background-color: $primary-hover; + } - &:active { - background-color: $primary-pressed; + &:active { + background-color: $primary-pressed; + } } } diff --git a/src/components/Hero.astro b/src/components/Hero.astro index 7b46bd0..c753a74 100644 --- a/src/components/Hero.astro +++ b/src/components/Hero.astro @@ -21,12 +21,11 @@ import Brand from './Brand.astro'; to tackle social challenges
- - Registration will close Feb. 16th. Follow + Follow @calhacks - on Instagram for updates! + on Instagram for future events and updates!
@@ -226,7 +225,7 @@ import Brand from './Brand.astro'; .bear-right { position: absolute; right: -$offset-right; - top: 50%; + top: 55%; transform: translate( calc(25px + clamp(#{-$offset-right}, -12vw, 0px)), calc(-160px - 50%) diff --git a/src/components/Navbar/index.tsx b/src/components/Navbar/index.tsx index ff28f14..0de8715 100644 --- a/src/components/Navbar/index.tsx +++ b/src/components/Navbar/index.tsx @@ -6,7 +6,6 @@ import { motion, AnimatePresence } from 'framer-motion'; import styles from './style.module.scss'; import logo from '../../graphics/tentative logo.svg'; import { useEffect, useRef } from 'react'; -import Button from '../Button'; interface Link { name: string; @@ -56,10 +55,6 @@ export default function NavBar({ links }: Props) {
{l.name}
))} - {/* registration button */} - {/* backdrop */} From d4da71ef21c9dce1b907894b95764947cea0781e Mon Sep 17 00:00:00 2001 From: jinkang-0 Date: Sun, 11 Feb 2024 17:17:52 -0800 Subject: [PATCH 2/2] remove unused import --- .prettierignore | 1 + src/components/Hero.astro | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.prettierignore b/.prettierignore index a0d9092..37e419b 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,5 +1,6 @@ .github/ .vscode/ +dist/ README.md diff --git a/src/components/Hero.astro b/src/components/Hero.astro index c753a74..1bcafcc 100644 --- a/src/components/Hero.astro +++ b/src/components/Hero.astro @@ -3,7 +3,6 @@ import { Image } from 'astro:assets'; import Button from './Button.astro'; import TitleAccent from './TitleAccent.astro'; import arrowsIcon from '../graphics/arrows.svg'; -import redirectArrow from '../graphics/redirect_arrow.svg'; import heroGraphicLeft from '../graphics/hero_shapes_left.svg'; import heroGraphicRight from '../graphics/hero_shapes_right.svg'; import bearLeft from '../graphics/bear_orange.svg';