Skip to content

Commit

Permalink
Merge pull request #30 from sliit-foss/fix/ui-update
Browse files Browse the repository at this point in the history
Fix: hero tile issue
  • Loading branch information
miyurugunarathna authored Aug 26, 2024
2 parents 192e457 + 6f78cb5 commit ffac8a5
Show file tree
Hide file tree
Showing 6 changed files with 2,828 additions and 3,305 deletions.
4 changes: 2 additions & 2 deletions apps/2024/src/app.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ const App = () => {
const location = useLocation();
return (
<div className="w-full bg-background">
<main className="w-full flex flex-col items-center min-h-screen mx-auto">
<main className="w-full flex flex-col items-center min-h-[100dvh] mx-auto">
<Header />
<div className="w-full max-w-body grow mt-[70px] xs:mt-[90px] cursor-default z-40">
<div className="w-full max-w-body grow cursor-default z-40">
<Routes location={location}>
<Route path="/" element={<Landing />} />
</Routes>
Expand Down
22 changes: 9 additions & 13 deletions apps/2024/src/components/common/layout/header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,28 +29,28 @@ const Header = ({ className }) => {
return (
<header
className={twMerge(
`w-full min-h-[70px] xs:min-h-[90px] backdrop-blur-md fixed z-[200] transition-all duration-long`,
`w-full min-h-[70px] backdrop-blur-md sticky top-0 z-[200] transition-all duration-long`,
className,
mobileNavOpen && !breakpoints['xl'] ? 'h-screen bg-white' : 'h-[70px] xs:h-[90px] bg-white/90'
mobileNavOpen && !breakpoints['xl'] ? 'h-screen bg-white' : 'h-[70px] bg-white/90'
)}>
<div className="w-full max-w-body mx-auto flex justify-between py-3.5 xs:py-6 px-8 lg:px-24">
<div className="w-full max-w-body mx-auto flex justify-between py-3.5 px-8 lg:px-24">
<div
className={twMerge(
'grid place-content-start grid-flow-col items-center space-x-[20px] sm:space-x-[30px] transition-all duration-medium',
'grid place-content-start grid-flow-col items-center space-x-[20px] transition-all duration-medium',
mobileNavOpen && !breakpoints['xl'] ? 'opacity-0' : 'opacity-100 pointer-events-none'
)}>
<Link
to="/"
onClick={() => window.scrollTo({ top: 0, behavior: 'smooth' })}
aria-label="Home"
className="hidden xsm:block ">
<Bashaway width={160} className="w-[160px] sm:w-[185px]" />
<Bashaway width={160} className="w-[140px] sm:w-[160px]" />
</Link>
<Times height="15px" width="15px" className="hidden xsm:block opacity-20" />
<FOSS className="transform scale-[0.85] -translate-x-1" />
<Times height="12px" width="12px" className="hidden xsm:block opacity-20" />
<FOSS className="transform scale-[0.70] -translate-x-1" />
</div>
<div className={twMerge('absolute inset-0 xl:relative')}>
<div className="w-full min-h-[70px] xs:min-h-[90px] xl:!min-h-0 flex justify-end items-center px-8 lg:px-24 relative z-50">
<div className="w-full min-h-[70px] xl:!min-h-0 flex justify-end items-center px-8 lg:px-24 relative z-50">
<RxHamburgerMenu
className={twMerge(mobileNavIconStyles, mobileNavOpen ? 'opacity-0 pointer-events-none' : 'opacity-100')}
onClick={setMobileNavOpen.bind(this, true)}
Expand All @@ -76,11 +76,7 @@ const Header = ({ className }) => {
{section}
</span>
))}
<Button
to={registrationLink}
target="_blank"
className="mt-1.5 xl:mt-0 px-8 xl:px-[1.15rem] pb-2.5 xl:pb-[0.4rem]"
disabled={!isRegistrationsOpen}>
<Button to={registrationLink} target="_blank" disabled={!isRegistrationsOpen}>
{isRegistrationsOpen ? 'Register' : 'Registration Closed'}
</Button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/2024/src/components/common/typography/body.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { twMerge } from 'tailwind-merge';
const BodyText = ({ children, className, ...props }) => {
return (
<span
className={twMerge('text-[25px] sm:text-[28px] text-center lg:text-start font-consolas', className)}
className={twMerge('text-[20px] sm:text-[28px] text-center lg:text-start font-consolas', className)}
{...props}>
{children}
</span>
Expand Down
8 changes: 4 additions & 4 deletions apps/2024/src/components/landing/hero.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ import { Bashaway } from '@/icons';

const Hero = () => {
return (
<div className="flex flex-col justify-center items-center gap-y-8 my-8">
<div className="flex flex-col justify-center items-center gap-y-8 py-4 min-h-[calc(100dvh-70px)]">
<Bashaway className="w-[280px] sm:w-[400px] h-[58px] sm:h-[78px]" />
<BodyText className="lg:text-center max-w-5xl px-10 md:px-12">
A unique competition that keeps the coders around the island on their toes. Welcome to ./bashaway {currentYear},
<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},
the third edition of the first-ever scripting and automation competition in Sri Lanka!
</BodyText>
<Button
to={`${registrationLink}`}
target="_blank"
className="mt-2 sm:text-[22px] px-6 py-2 rounded-full tracking-[0.44px] z-10"
className="mt-2 sm:text-[22px] px-6 py-2 rounded-full tracking-[0.44px]"
disabled={!isRegistrationsOpen}>
{isRegistrationsOpen ? 'Register Now' : 'Registration Closed'}
</Button>
Expand Down
2 changes: 1 addition & 1 deletion apps/2024/src/components/landing/marquee.jsx
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">
<FastMarquee className="bg-black h-[46px] text-xl sm:text-[22px] text-white font-consolas z-20 sticky bottom-0">
<div className={twMerge('flex gap-x-12 items-center mr-12')}>
{Array(3)
.fill(0)
Expand Down
Loading

0 comments on commit ffac8a5

Please sign in to comment.