Skip to content

Commit 742ce95

Browse files
sloanfingersloanfinger
authored
Merge pull request #154 from Lathryx/dev
Quickfix navbar colors and homepage content height
2 parents 4289cd4 + 2bbecc7 commit 742ce95

4 files changed

Lines changed: 10 additions & 8 deletions

File tree

‎src/app/layout.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export default function RootLayout({
152152
children,
153153
}: Readonly<{ children: React.ReactNode }>) {
154154
return (
155-
<html lang="en" className={`${baru.variable} ${myriad.variable}`}>
155+
<html data-theme="dark" lang="en" className={`${baru.variable} ${myriad.variable}`}>
156156
<body className="flex min-h-screen flex-col">
157157
<Navigation />
158158
<main className="flex-1 text-night bg-linear-to-b from-snow to-putty dark:text-snow dark:from-dark-purple dark:to-night">{children}</main>

‎src/app/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import blob2 from "public/blobs/blob2.svg";
88
export default async function HomePage() {
99
return (
1010
<div className="m-0 p-0 relative overflow-x-hidden">
11-
<div className="m-4 lg:m-10 h-[76vh] isolate flex flex-col-reverse justify-around items-center lg:flex-row">
11+
<div className="m-4 lg:m-10 h-[90vh] isolate flex flex-col-reverse justify-around items-center lg:flex-row">
1212
<Image src={blob1} alt="background blob" className="absolute w-full h-full translate-x-145 -translate-y-5 rotate-10 -z-10 fill-[radial-gradient(circle_at_center,#ba0c2f,#dccbcb,#e4002b)]"/>
1313
<Image src={blob2} alt="background blob" className="absolute w-full h-full -translate-x-165 translate-y-80 -rotate-50 -z-10 fill-[radial-gradient(circle_at_center,#ba0c2f,#dccbcb,#e4002b)]" />
1414

‎src/components/Navigation.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ function LinkInBio() {
108108
</LinkButton>
109109
<Link
110110
href="?"
111-
className="flex items-center justify-center gap-2 rounded-sm bg-rose-300 px-4 py-2 font-medium text-black hover:underline"
111+
className="flex items-center justify-center gap-2 rounded-sm bg-rose-300 px-4 py-2 font-medium hover:underline"
112112
>
113113
Continue to Website
114114
<PiArrowRightBold />
@@ -119,7 +119,7 @@ function LinkInBio() {
119119
<Link
120120
href="https://uga.campuslabs.com/engage/organization/devdogs"
121121
target="_blank"
122-
className="flex items-center justify-between gap-2 rounded-sm bg-rose-200 px-4 py-2 text-black hover:underline"
122+
className="flex items-center justify-between gap-2 rounded-sm bg-rose-200 px-4 py-2 hover:underline"
123123
>
124124
<PiLink />
125125
<span className="w-full text-center">
@@ -134,7 +134,7 @@ function LinkInBio() {
134134
<Link
135135
href="https://gdg.community.dev/gdg-on-campus-university-of-georgia-athens-united-states/"
136136
target="_blank"
137-
className="flex items-center justify-between gap-2 rounded-sm bg-rose-200 px-4 py-2 text-black hover:underline"
137+
className="flex items-center justify-between gap-2 rounded-sm bg-rose-200 px-4 py-2 hover:underline"
138138
>
139139
<PiLink />
140140
<span className="w-full text-center">Google DGC: UGA Listing</span>
@@ -147,7 +147,7 @@ function LinkInBio() {
147147
<Link
148148
href="https://docs.google.com/forms/d/e/1FAIpQLSfH6BQCUm96Q9rUu-WKVeG6qzM4tRrXzfwxj_Np8XJoZtlZJQ/viewform"
149149
target="_blank"
150-
className="flex items-center justify-between gap-2 rounded-sm bg-rose-200 px-4 py-2 text-black hover:underline"
150+
className="flex items-center justify-between gap-2 rounded-sm bg-rose-200 px-4 py-2 hover:underline"
151151
>
152152
<PiLink />
153153
<span className="w-full text-center">Focus Lead Interest Form</span>
@@ -160,7 +160,7 @@ function LinkInBio() {
160160
<Link
161161
href="https://forms.gle/7DFteDC9iGu5rVCL7"
162162
target="_blank"
163-
className="flex items-center justify-between gap-2 rounded-sm bg-rose-200 px-4 py-2 text-black hover:underline"
163+
className="flex items-center justify-between gap-2 rounded-sm bg-rose-200 px-4 py-2 hover:underline"
164164
>
165165
<PiLink />
166166
<span className="w-full text-center">A-Team Interest Form</span>
@@ -219,7 +219,7 @@ export default async function Navigation() {
219219

220220
return (
221221
<NavContainer>
222-
<nav className="fixed top-0 left-0 z-60 flex w-full flex-col from-rose-950/20 to-black/30 py-0.75 transition-[background-color,box-shadow,backdrop-filter] group-data-from-link-in-bio:h-dvh group-data-scrolled:bg-black/30 group-data-scrolled:shadow-xl group-data-scrolled:backdrop-blur-sm group-data-[state=open]:border-rose-600 group-data-[state=open]:bg-radial group-data-[state=open]:backdrop-blur-sm">
222+
<nav className="fixed top-0 left-0 z-60 flex w-full flex-col text-night dark:text-snow from-rose-950/20 to-black/30 py-0.75 transition-[background-color,box-shadow,backdrop-filter] group-data-from-link-in-bio:h-dvh group-data-scrolled:bg-black/30 group-data-scrolled:shadow-xl group-data-scrolled:backdrop-blur-sm group-data-[state=open]:border-rose-600 group-data-[state=open]:bg-radial group-data-[state=open]:backdrop-blur-sm">
223223
<div className="mx-auto flex w-full max-w-360 grid-cols-[1fr_max-content_1fr] items-center justify-between px-4 py-4.25 md:px-6 md:py-4.5 lg:grid">
224224
<Link href="/">
225225
<h1 className="flex items-center gap-2 text-xl font-bold md:text-2xl lg:gap-2.5">

‎src/styles/globals.css‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
@plugin "@tailwindcss/typography";
33
@plugin "@tailwindcss/forms";
44

5+
@custom-variant dark (&:where([data-theme=dark], [data-theme=dark] *));
6+
57
@font-face {
68
font-family: 'Myriad Pro';
79
src: url('/fonts/myriad-pro/MYRIADPRO-REGULAR.otf') format('opentype');

0 commit comments

Comments
 (0)