Skip to content

Day lesssimplechanges william #145

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

Merged
BastedEggsRYummy merged 9 commits into from
Oct 31, 2025
Merged

Day lesssimplechanges william #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8a202fc
Removed 2048 leaderboard from header
Iamchwill Sep 30, 2025
9fee377
Repeated changes to mobile. Attempting to shrink register with header…
Iamchwill Sep 30, 2025
eae4409
Removed old header parts
Iamchwill Oct 24, 2025
4fc2e7f
Making the button resize!
Iamchwill Oct 24, 2025
c5768ef
Trying to make the text change
Iamchwill Oct 24, 2025
f8a7315
Modified tailwind config for new shift screen
Iamchwill Oct 24, 2025
c7fcb6c
After testing this is the size needed
Iamchwill Oct 24, 2025
ef79f0e
IT WORKS
Iamchwill Oct 24, 2025
b2061da
Needed to change it so that other registration buttons don't shrink
Iamchwill Oct 24, 2025
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
24 changes: 13 additions & 11 deletions components/nav-bar/desktop/nav-bar-desktop.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import NextImg from "next/image";
import { NavGroup } from "@/data/nav-bar-links";
import logo from "@/public/Retro_HackRPI_Logo.png";
import RegistrationButton from "@/components/themed-components/registration-link";
import RegistrationButton from "@/components/themed-components/registration-header-link";

import NavGroupComponent from "./nav-group";
import Link from "next/link";

Expand Down Expand Up @@ -30,19 +31,19 @@ export default function DesktopNavBar({ links }: { links: NavGroup[] }) {
>
Sponsor Us
</Link>
<Link
{/* <Link
href="/event"
className="mx-2 whitespace-nowrap text-lg xl:text-xl bg-[length:0%_2px] bg-no-repeat bg-left-bottom transition-all duration-200 bg-gradient-to-r from-hackrpi-yellow to-hackrpi-pink hover:bg-[length:100%_2px]"
>
Event Info
</Link>
<Link
</Link> */}
{/* <Link
href="/event/schedule"
className="mx-2 whitespace-nowrap text-lg xl:text-xl bg-[length:0%_2px] bg-no-repeat bg-left-bottom transition-all duration-200 bg-gradient-to-r from-hackrpi-yellow to-hackrpi-pink hover:bg-[length:100%_2px]"
>
Schedule
</Link>
<Link
</Link> */}
{/* <Link
href="/announcements"
className="mx-2 whitespace-nowrap text-lg xl:text-xl bg-[length:0%_2px] bg-no-repeat bg-left-bottom transition-all duration-200 bg-gradient-to-r from-hackrpi-yellow to-hackrpi-pink hover:bg-[length:100%_2px]"
>
Expand All @@ -53,13 +54,14 @@ export default function DesktopNavBar({ links }: { links: NavGroup[] }) {
className="mx-2 whitespace-nowrap text-lg xl:text-xl bg-[length:0%_2px] bg-no-repeat bg-left-bottom transition-all duration-200 bg-gradient-to-r from-hackrpi-yellow to-hackrpi-pink hover:bg-[length:100%_2px]"
>
Prizes
</Link>
<Link
</Link> */}
{/* <Link
href="/2048/leaderboard"
className="mx-2 whitespace-nowrap text-lg xl:text-xl bg-[length:0%_2px] bg-no-repeat bg-left-bottom transition-all duration-200 bg-gradient-to-r from-hackrpi-yellow to-hackrpi-pink hover:bg-[length:100%_2px]"
>
2048 Leaderboard
</Link>
</Link> */}

<Link
href="https://static.mlh.io/docs/mlh-code-of-conduct.pdf"
className="mx-2 whitespace-nowrap text-lg xl:text-xl bg-[length:0%_2px] bg-no-repeat bg-left-bottom transition-all duration-200 bg-gradient-to-r from-hackrpi-yellow to-hackrpi-pink hover:bg-[length:100%_2px]"
Expand All @@ -68,8 +70,8 @@ export default function DesktopNavBar({ links }: { links: NavGroup[] }) {
Code of Conduct
</Link>
</div>
<div className="w-fit flex items-center justify-around ml-2">
<RegistrationButton className="w-fit whitespace-nowrap" />
<div className="ml-2">
<RegistrationButton className="w-auto" />
</div>
</div>
</div>
Expand Down
8 changes: 7 additions & 1 deletion components/nav-bar/mobile/nav-bar-mobile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { NavGroup } from "@/data/nav-bar-links";
import { useState, useEffect } from "react";
import NextImg from "next/image";
import hackrpi_logo from "@/public/Retro_HackRPI_Logo.png";
import hackrpi_logo from "@/public/HackRPI_Logo_Yellow_Arrow.png";
import NavGroupComponent from "./nav-group";
import Link from "next/link";

Expand Down Expand Up @@ -61,6 +61,12 @@ export default function MobileNavBar({ links }: { links: NavGroup[] }) {
>
Sponsor Us
</Link>
{/* <Link
href="/2048/leaderboard"
className="w-11/12 whitespace-nowrap text-2xl p-2 bg-[length:0%_4px] bg-no-repeat bg-left-bottom transition-all duration-200 bg-gradient-to-r from-hackrpi-primary-blue to-hackrpi-primary-blue hover:bg-[length:100%_4px]"
>
2048 Leaderboard
</Link> */}
<Link
href="https://static.mlh.io/docs/mlh-code-of-conduct.pdf"
className="w-11/12 whitespace-nowrap text-2xl p-2 bg-[length:0%_4px] bg-no-repeat bg-left-bottom transition-all duration-200 bg-gradient-to-r from-hackrpi-primary-blue to-hackrpi-primary-blue hover:bg-[length:100%_4px]"
Expand Down
14 changes: 14 additions & 0 deletions components/themed-components/registration-header-link.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import HackRPILink from "./hackrpi-link";

export default function RegistrationLink({ className }: { className?: string }) {
return (
<HackRPILink
href="https://hackrpi2024.devpost.com/project-gallery"
className={`${className} px-4 py-2 inline-block`}
target="_blank"
>
<span className="block shift:hidden">Register Here!</span>
<span className="hidden shift:block">Register!</span>
</HackRPILink>
);
}
2 changes: 2 additions & 0 deletions tailwind.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type { Config } from "tailwindcss";
import plugin from "tailwindcss/plugin";

const config: Config = {

content: [
"./pages/**/*.{js,ts,jsx,tsx,mdx}",
"./components/**/*.{js,ts,jsx,tsx,mdx}",
Expand Down Expand Up @@ -55,6 +56,7 @@ const config: Config = {
screens: {
desktop: "860px",
xs: "475px",
shift: { max: "950px" },
"2xs": "375px",
},
backgroundImage: {
Expand Down
Loading