Skip to content

[I2-14] Updated navbar to sticky #45

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

Closed
wants to merge 1 commit into from
Closed

[I2-14] Updated navbar to sticky #45

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
4 changes: 2 additions & 2 deletions frontend/src/components/Landing/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import Background from '@/components/Background';
import Navbar from '@/components/Navbar';

Check warning on line 2 in frontend/src/components/Landing/index.tsx

View workflow job for this annotation

GitHub Actions / build 

'Navbar' is defined but never used

Check warning on line 2 in frontend/src/components/Landing/index.tsx

View workflow job for this annotation

GitHub Actions / build 

'Navbar' is defined but never used

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
2 changes: 1 addition & 1 deletion frontend/src/components/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import React from 'react';

const Layout = ({ children }: { children: React.ReactNode }) => {
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">
<Navbar />
{children}
<Footer />
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff 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-10 flex justify-between items-center relative z-10 shadow-lg rounded-md bg-white/15 backdrop-blur-md px-6 py-6">
<Link href="/">
<Image
src="/assets/csesoc_logo.svg"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/404.tsx
View file
Open in desktop
Original file line number Diff line number Diff 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
2 changes: 1 addition & 1 deletion frontend/src/pages/events.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Events from '@/components/Event';

export default function EventsPage() {
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">
<Navbar />
<Events/>
<Footer />
Expand Down
12 changes: 7 additions & 5 deletions frontend/src/pages/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
import Navbar from '@/components/Navbar';
import Landing from '@/components/Landing';
import Sponsors from '@/components/Sponsors/index';
import AboutHomePage from '@/components/About/AboutHomepage';
import EventsBrief from '@/components/Event/EventsBrief';

export default function HomePage() {
return (
<section>
<Landing />
<AboutHomePage />
<EventsBrief />
<Sponsors />
<section className="flex flex-col min-h-screen justify-between py-8 xl:px-24 md:px-10 px-5 relative">
<Navbar />
<Landing />
<AboutHomePage />
<EventsBrief />
<Sponsors />
</section>
);
}
Loading