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

fix: footer links and menu overlay are displayed better on mobile #247

Merged
merged 1 commit into from
Feb 25, 2025
Merged

fix: footer links and menu overlay are displayed better on mobile #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
"eslint-plugin-prettier": "^5.2.1",
"lint-staged": "^15.3.0",
"postcss": "^8.4.49",
"prettier": "^3.5.2",
"prettier-plugin-jsdoc": "^1.3.0",
"prettier-plugin-tailwindcss": "^0.6.9",
"simple-git-hooks": "^2.11.1",
Expand Down
37 changes: 20 additions & 17 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default function RootLayout({ children }: RootLayoutProps) {
src="https://umami.csclub.org.au/script.js"
data-website-id={env.NEXT_PUBLIC_UMAMI_WEBSITE_ID}
/>
<body className="overflow-x-hidden bg-grey text-white">
<body id="root" className="overflow-x-hidden bg-grey text-white">
<Header />
<div className="mx-auto min-h-screen w-responsive pb-6 pt-32 md:pt-40">
{children}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default function Footer() {
</p>
</div>
{/* Social Media Links */}
<div className="order-1 mb-4 flex justify-center space-x-4 text-2xl text-black md:order-2 md:mb-0 md:justify-end">
<div className="order-1 mb-4 flex flex-wrap justify-center gap-4 text-2xl text-black md:order-2 md:mb-0 md:flex-nowrap md:justify-end">
{LINKS.map((link, i) => (
<Link {...link} borderColour="yellow" key={i} />
))}
Expand Down
17 changes: 14 additions & 3 deletions src/components/Header/HeaderMobileClient.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import { logout } from '@/lib/actions';
import Link from 'next/link';
import { useState } from 'react';
import { useEffect, useState } from 'react';
import { IoMdClose, IoMdMenu } from 'react-icons/io';
import type { HeaderData } from '.';
import FancyRectangle from '../FancyRectangle';
Expand Down Expand Up @@ -31,9 +31,20 @@ export default function HeaderMobileClient({
setIsMenuOpen(false);
};

useEffect(() => {
const rootDiv = document.getElementById('root')!;
if (isMenuOpen) {
rootDiv.classList.remove('overflow-y-scroll');
rootDiv.classList.add('overflow-y-hidden');
} else {
rootDiv.classList.add('overflow-y-scroll');
rootDiv.classList.remove('overflow-y-hidden');
}
}, [isMenuOpen]);

return (
<div
className={`${className} fixed z-[9999] w-full transition-all ${isMenuOpen ? 'h-full bg-white/95' : ''}`}
className={`${className} fixed z-[9999] w-full transition-all ${isMenuOpen ? 'h-dvh overflow-y-scroll bg-white/95' : ''}`}
>
<ScrollShader className={isMenuOpen ? 'hidden' : ''} />
<div
Expand Down Expand Up @@ -69,7 +80,7 @@ export default function HeaderMobileClient({
{isMenuOpen && (
<>
<div className="mt-8 h-0.5 w-full bg-grey" />
<div className="mt-12 flex flex-col items-center gap-8 text-4xl text-grey">
<div className="mt-12 flex flex-col items-center gap-8 text-3xl text-grey md:text-4xl">
<Links onClick={closeMenu} />
<div className="mt-4 h-0.5 w-full bg-grey" />
{data.isSignedIn && data.nextStep === 'signup' && (
Expand Down