Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

[I2-14] - Standardised navbar across all pages#46

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.

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

Already on GitHub?Sign in to your account

Merged
dlynz merged 5 commits intomasterfromI2-14/sticky-nav
Jun 3, 2025
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
5 changes: 2 additions & 3 deletionsfrontend/src/components/Landing/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
import Background from '@/components/Background';
import Navbar from '@/components/Navbar';

const Landing = () => {
return (
<section
className="flex flex-col min-h-screen justify-between py-8 xl:px-24 md:px-10 px-5 relative overflow-hidden"
className="flex flex-col min-h-screen justify-end py-8 xl:px-24 md:px-10 px-5 relative overflow-hidden"
id="landing"
>
<Navbar />

<Background />
<div className="flex justify-between items-end">
<div>
Expand Down
10 changes: 7 additions & 3 deletionsfrontend/src/components/Layout.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,14 @@ import React from 'react';

const Layout = ({ children }: { children: React.ReactNode }) => {
return (
<section className="flex flex-col min-h-screen justify-between py-8xl:px-24 md:px-10 px-5relative overflow-hidden">
<section className="flex flex-col min-h-screen justify-between py-8 relative">
<Navbar />
{children}
<Footer />

<div className='xl:px-24 md:px-10 px-5 '>
{children}
<Footer />
</div>

</section>
);
};
Expand Down
2 changes: 1 addition & 1 deletionfrontend/src/components/Navbar.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ const Navbar = () => {
}, []);

return (
<nav className="flex justify-between items-center relative z-10">
<nav className="sticky top-0flex justify-between items-center relative z-10 shadow-lg rounded-md bg-black/15 backdrop-blur-md xl:px-24 md:px-10 px-5 py-6">
<Link href="/">
<Image
src="/assets/csesoc_logo.svg"
Expand Down
2 changes: 1 addition & 1 deletionfrontend/src/pages/404.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import Navbar from '@/components/Navbar';

export default function Custom404() {
return (
<section className="flex flex-col min-h-screen justify-between py-8 xl:px-24 md:px-10 px-5 relative overflow-hidden">
<section className="flex flex-col min-h-screen justify-between py-8 xl:px-24 md:px-10 px-5 relative">
<div className="items-center text-center">
<Navbar />
<h1 className="text-5xl font-bold pt-24">404 - Page Not Found</h1>
Expand Down
10 changes: 7 additions & 3 deletionsfrontend/src/pages/events.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,14 @@ import Events from '@/components/Event';

export default function EventsPage() {
return (
<section className="flex flex-col min-h-screen justify-between py-8xl:px-24 md:px-10 px-5relative overflow-hidden">
<section className="flex flex-col min-h-screen justify-between py-8 relative">
<Navbar />
<Events/>
<Footer />

<div className='xl:px-24 md:px-10 px-5 '>
<Events/>
<Footer />
</div>

</section>
);
}
16 changes: 12 additions & 4 deletionsfrontend/src/pages/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import Navbar from '@/components/Navbar';
import Landing from '@/components/Landing';
import Sponsors from '@/components/Sponsors/index';
import AboutHomePage from '@/components/About/AboutHomepage';
Expand All@@ -6,10 +7,17 @@ import EventsBrief from '@/components/Event/EventsBrief';
export default function HomePage() {
return (
<section>
<Landing />
<AboutHomePage />
<EventsBrief />
<Sponsors />
<div className="h-8"></div>

<Navbar />

<div className="-mt-36">
<Landing />
</div>

<AboutHomePage />
<EventsBrief />
<Sponsors />
</section>
);
}
Loading
[8]ページ先頭
©2009-2025 Movatter.jp