Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Fix(hero): fix marquee and register button overlap" #29

Closed
wants to merge 2 commits into from
Closed

Revert "Fix(hero): fix marquee and register button overlap" #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5817bd
Revert "Fix(hero): fix marquee and register button overlap"
Akalanka47000 Aug 26, 2024
ec68edb
Merge branch 'main' into revert-28-fix/marquee-register-btn-overlap
Akalanka47000 Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/2024/src/components/landing/hero.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Bashaway } from '@/icons';

const Hero = () => {
return (
<div className="flex flex-col justify-center items-center gap-y-8 py-4 min-h-[calc(100dvh-70px)]">
<div className="h-[calc(100vh-70px-46px)] xs:h-[calc(100vh-90px-46px)] flex flex-col justify-center items-center gap-y-8">
<Bashaway className="w-[280px] sm:w-[400px] h-[58px] sm:h-[78px]" />
<BodyText className="lg:text-center max-w-5xl px-8">
A unique competition that keeps the coders around the island on their toes. Welcome to Bashaway {currentYear},
Expand Down
2 changes: 1 addition & 1 deletion apps/2024/src/components/landing/marquee.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Bashaway } from '@/icons';

const Marquee = () => {
return (
<FastMarquee className="bg-black h-[46px] text-xl sm:text-[22px] text-white font-consolas z-20 sticky bottom-0">
<FastMarquee className="bg-black h-[46px] text-xl sm:text-[22px] text-white font-consolas absolute bottom-0 left-0">
<div className={twMerge('flex gap-x-12 items-center mr-12')}>
{Array(3)
.fill(0)
Expand Down
4 changes: 2 additions & 2 deletions apps/2024/src/pages/landing.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {

const Landing = () => {
return (
<div className="flex flex-col">
<>
<Hero />
<Marquee />
<Mission />
Expand All @@ -30,7 +30,7 @@ const Landing = () => {
<PastEvents />
<Gallery />
<Partners />
</div>
</>
);
};

Expand Down
Loading