diff --git a/src/components/Navbar/NavItems.tsx b/src/components/Navbar/NavItems.tsx index 83f63760..e07d9af6 100644 --- a/src/components/Navbar/NavItems.tsx +++ b/src/components/Navbar/NavItems.tsx @@ -6,17 +6,18 @@ interface NavItemsProps { } const links = [ - { title: 'About', href: 'about-section' }, - { title: 'Sponsors', href: 'sponsors-section' }, - { title: 'Partners', href: 'partners-section' }, - { title: 'FAQ', href: 'faq-section' }, - { title: 'The Team', href: 'team-section' }, - { title: 'Contact', href: 'contact-section' }, + { title: 'About', href: 'about-anchor' }, + { title: 'Sponsors', href: 'sponsors-anchor', offset: 200 }, + { title: 'Partners', href: 'partners-anchor', offset: 20 }, + { title: 'FAQ', href: 'faq-anchor', offset: 120 }, + { title: 'The Team', href: 'team-anchor' }, + { title: 'Contact', href: 'contact-anchor', offset: 500 }, ]; const rowStyle = 'flex-row items-center'; const colStyle = 'flex-col lg:p-0'; -const scrollPadding = -120; +const navbarHeightPx = 80; +const scrollPaddingPx = -navbarHeightPx; // navbarHeight + extra padding const NavItems: React.FC = ({ isHorizontal, handleClick }) => { return ( @@ -29,10 +30,15 @@ const NavItems: React.FC = ({ isHorizontal, handleClick }) => {
  • {link.title} diff --git a/src/components/Navbar/Navbar.tsx b/src/components/Navbar/Navbar.tsx index b4e58509..7c501de8 100644 --- a/src/components/Navbar/Navbar.tsx +++ b/src/components/Navbar/Navbar.tsx @@ -28,9 +28,7 @@ const Navbar = () => {
    - +
    {/* banner-holder: banner is out of flow, to prevent banner affect the desired flow, adding a placeholder banner holder when the screen is smaller */} diff --git a/src/components/sections/Contact.section.tsx b/src/components/sections/Contact.section.tsx index 8d4314b9..87ad8a1a 100644 --- a/src/components/sections/Contact.section.tsx +++ b/src/components/sections/Contact.section.tsx @@ -11,7 +11,7 @@ import { SocialIcons } from '@components'; const ContactSection: React.FC = () => { return ( -
    +
    {
    -

    +

    CONTACT US

    diff --git a/src/components/sections/HeroStats.section.tsx b/src/components/sections/HeroStats.section.tsx index 53efa326..4275de88 100644 --- a/src/components/sections/HeroStats.section.tsx +++ b/src/components/sections/HeroStats.section.tsx @@ -79,11 +79,11 @@ const HeroStatSection: React.FC = () => {

    -
    -

    +
    +

    About Hawkhacks

    diff --git a/src/components/sections/Sponsor.section.tsx b/src/components/sections/Sponsor.section.tsx index 032d5476..52da5556 100644 --- a/src/components/sections/Sponsor.section.tsx +++ b/src/components/sections/Sponsor.section.tsx @@ -25,10 +25,7 @@ import { const SponsorFAQSection = () => { return (
    -
    +
    Top Border { />
    -
    +
    SPONSORS
    @@ -152,8 +152,11 @@ const SponsorFAQSection = () => { />
    -
    -
    +
    +
    PARTNERS
    diff --git a/src/components/sections/TeamFAQ.section.tsx b/src/components/sections/TeamFAQ.section.tsx index bba14a57..f93a22ab 100644 --- a/src/components/sections/TeamFAQ.section.tsx +++ b/src/components/sections/TeamFAQ.section.tsx @@ -43,16 +43,16 @@ const Department: React.FC = ({ title, members }) => { ); }; -// the naming is confusing... -// faq section first, but the meet the team banner is within faq section... -// not separate enough... const TeamSection = () => { return (
    -
    +
    -

    +

    FAQ

    @@ -62,12 +62,11 @@ const TeamSection = () => {
    -
    - {/* remove the overflow, and set negative offset works like a charm */} -
    +
    +
    * { - grid-column: 1 / -1; - grid-row: 1 / -1; + grid-column: 1 / -1; + grid-row: 1 / -1; } .stacked > .media { - z-index: -1; - width: 100%; - height: 100%; + z-index: -1; + width: 100%; + height: 100%; } .place-items-end-center { - place-items: end center; + place-items: end center; } }