Skip to content

Commit 8bf8b2c

Browse files
committed
Default color updates
1 parent 7ddfff3 commit 8bf8b2c

File tree

8 files changed

+25
-51
lines changed

8 files changed

+25
-51
lines changed

src/components/GGHeader.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { MobileNav } from './MobileNav';
44
export default function GGHeader({ title }: { title: string }) {
55
return (
66
<>
7-
<header className="sticky top-0 z-50 w-full border-border/40 bg-red-600 text-white">
7+
<header className="sticky top-0 z-50 w-full border-border/40 bg-red-600">
88
<div className="container flex h-14 max-w-screen-2xl items-center">
99
<MainNav />
1010
<MobileNav title={title} />

src/components/HiddenLink.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { cn } from '@/lib/utils';
2-
import { ReactNode, useState, type JSX } from 'react';
2+
import { useState, type JSX } from 'react';
33

44
type HiddenElementProps = {
55
text: string;
@@ -15,7 +15,7 @@ export default function HiddenElement({
1515
const [mail, setMail] = useState(
1616
<span
1717
className={cn(
18-
'h-4 cursor-pointer font-semibold text-white underline',
18+
'h-4 cursor-pointer font-semibold underline',
1919
className,
2020
)}
2121
onClick={() => {

src/components/MainFooter.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export default function MainFooter({ className = '' }) {
7474
className="relative transition hover:text-purple-600"
7575
target="_blank"
7676
>
77-
<FaTwitch className="top-0 text-yellow-200 opacity-0 blur-sm hover:opacity-100" />
77+
<FaTwitch className="top-0 text-white opacity-0 blur-sm hover:opacity-100" />
7878
<FaTwitch className="pointer-events-none absolute top-0" />
7979
</a>
8080
<a
@@ -83,7 +83,7 @@ export default function MainFooter({ className = '' }) {
8383
target="_blank"
8484
>
8585
<FaYoutube className="absolute -left-1.5 -top-1.5 z-0 text-5xl text-white opacity-0 blur-sm group-hover:opacity-100"></FaYoutube>
86-
<div className="absolute left-1/3 top-1/3 h-3 w-3 bg-white opacity-0 group-hover:opacity-100" />
86+
<div className="absolute left-1/3 top-1/3 h-1/3 w-1/3 bg-white opacity-0 group-hover:opacity-100" />
8787
<FaYoutube className="pointer-events-none relative top-0 z-10" />
8888
</a>
8989
</div>

src/components/MainNav.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ function NavLink({ href, text }: NavLinkProps) {
3131
<Link
3232
href={href}
3333
className={cn(
34-
'transition-colors hover:text-white/90',
35-
highlightPath(router.asPath, href) ? 'text-white' : 'text-white/80',
34+
'transition-colors hover:text-foreground/90',
35+
highlightPath(router.asPath, href) ? 'text-foreground' : 'text-foreground/80',
3636
)}
3737
>
3838
{text}
@@ -85,7 +85,7 @@ export function MainNav() {
8585
className="relative transition hover:text-purple-600"
8686
target="_blank"
8787
>
88-
<FaTwitch className="top-0 text-yellow-200 opacity-0 blur-sm hover:opacity-100" />
88+
<FaTwitch className="top-0 text-white opacity-0 blur-sm hover:opacity-100" />
8989
<FaTwitch className="pointer-events-none absolute top-0" />
9090
</a>
9191
<a
@@ -94,7 +94,7 @@ export function MainNav() {
9494
target="_blank"
9595
>
9696
<FaYoutube className="absolute z-0 text-3xl text-white opacity-0 blur-sm group-hover:opacity-100"></FaYoutube>
97-
<div className="absolute left-1/3 top-1/3 h-2 w-2 bg-white opacity-0 group-hover:opacity-100" />
97+
<div className="absolute left-1/3 top-1/3 h-1/3 w-1/3 bg-white opacity-0 group-hover:opacity-100" />
9898
<FaYoutube className="pointer-events-none relative top-0 z-10" />
9999
</a>
100100
</div>

src/components/MobileFooter.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ export default function MobileFooter({ className = '' }) {
4444
className="relative transition hover:text-purple-600"
4545
target="_blank"
4646
>
47-
<FaTwitch className="top-0 text-yellow-200 opacity-0 blur-sm hover:opacity-100" />
47+
<FaTwitch className="top-0 text-white opacity-0 blur-sm hover:opacity-100" />
4848
<FaTwitch className="pointer-events-none absolute top-0" />
4949
</a>
5050
<a
5151
href={socials.youtube}
5252
className="group relative transition hover:text-red-600"
5353
target="_blank"
5454
>
55-
<FaYoutube className="absolute z-0 text-5xl text-white opacity-0 blur-sm group-hover:opacity-100"></FaYoutube>
56-
<div className="absolute left-1/3 top-1/3 h-4 w-4 bg-white opacity-0 group-hover:opacity-100" />
55+
<FaYoutube className="absolute z-0 text-4xl text-white opacity-0 blur-sm group-hover:opacity-100"></FaYoutube>
56+
<div className="absolute left-1/3 top-1/3 h-3 w-3 bg-white opacity-0 group-hover:opacity-100" />
5757
<FaYoutube className="pointer-events-none relative top-0 z-10" />
5858
</a>
5959
</div>
@@ -75,7 +75,7 @@ export default function MobileFooter({ className = '' }) {
7575
<HiddenElement text="Vis epost">
7676
<a
7777
href="mailto:styret@ggbergen.org"
78-
className="h-4 cursor-pointer text-white underline hover:underline md:no-underline"
78+
className="h-4 cursor-pointer underline hover:underline md:no-underline"
7979
>
8080
<span className="font-semibold">styret@ggbergen.org</span>
8181
</a>

src/components/MobileNav.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ const NavLink = forwardRef<
4141
ref={ref}
4242
href={href}
4343
className={cn(
44-
'my-1 pl-4 text-xl font-semibold transition-colors hover:text-white/90',
45-
highlightPath(router.asPath, href) ? 'text-white' : 'text-white/80',
44+
'my-1 pl-4 text-xl font-semibold transition-colors hover:text-foreground/90',
45+
highlightPath(router.asPath, href) ? 'text-foreground' : 'text-foreground/80',
4646
)}
4747
{...props}
4848
>
@@ -62,7 +62,7 @@ export function MobileNav({ title }: { title: string }) {
6262
<Button
6363
variant="ghost"
6464
size={'lg'}
65-
className="z-10 mr-2 px-0 text-base text-white hover:bg-transparent hover:text-white focus-visible:bg-transparent focus-visible:ring-0 focus-visible:ring-offset-0 md:hidden"
65+
className="z-10 mr-2 px-0 text-base hover:bg-transparent focus-visible:bg-transparent focus-visible:ring-0 focus-visible:ring-offset-0 md:hidden"
6666
>
6767
<FaBars className="!h-8 !w-8" />
6868
<span className="sr-only">Toggle Menu</span>
@@ -115,16 +115,16 @@ export function MobileNav({ title }: { title: string }) {
115115
className="relative transition hover:text-purple-600"
116116
target="_blank"
117117
>
118-
<FaTwitch className="top-0 text-yellow-200 opacity-0 blur-sm hover:opacity-100" />
118+
<FaTwitch className="top-0 text-white opacity-0 blur-sm hover:opacity-100" />
119119
<FaTwitch className="pointer-events-none absolute top-0" />
120120
</a>
121121
<a
122122
href={socials.youtube}
123123
className="group relative transition hover:text-red-600"
124124
target="_blank"
125125
>
126-
<FaYoutube className="absolute z-0 text-5xl text-white opacity-0 blur-sm group-hover:opacity-100"></FaYoutube>
127-
<div className="absolute left-1/3 top-1/3 h-4 w-4 bg-white opacity-0 group-hover:opacity-100" />
126+
<FaYoutube className="absolute z-0 text-4xl text-white opacity-0 blur-sm group-hover:opacity-100"></FaYoutube>
127+
<div className="absolute left-1/3 top-1/3 h-3 w-3 bg-white opacity-0 group-hover:opacity-100" />
128128
<FaYoutube className="pointer-events-none relative top-0 z-10" />
129129
</a>
130130
</div>

src/pages/_app.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ export default function App({ Component, pageProps }: AppProps) {
2121
<Head>
2222
<title>{title}</title>
2323
</Head>
24-
<div className="flex min-h-screen flex-col bg-background bg-blue-950">
24+
<div className="flex min-h-screen flex-col bg-background">
2525
<GGHeader title={subTitle} />
26-
<main className="container flex-1 text-white">
26+
<main className="container flex-1">
2727
<Component {...pageProps} />
2828
</main>
2929
<GGFooter />

src/styles/globals.css

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,11 @@
33

44
@layer base {
55
:root {
6-
--background: 0 100% 100%;
7-
--foreground: 240 10% 3.9%;
8-
--card: 0 0% 100%;
9-
--card-foreground: 240 10% 3.9%;
10-
--popover: 0 0% 100%;
11-
--popover-foreground: 240 10% 3.9%;
12-
--primary: 240 5.9% 10%;
13-
--primary-foreground: 0 0% 98%;
14-
--secondary: 240 4.8% 95.9%;
15-
--secondary-foreground: 240 5.9% 10%;
16-
--muted: 240 4.8% 95.9%;
17-
--muted-foreground: 240 3.8% 46.1%;
18-
--accent: 240 4.8% 95.9%;
19-
--accent-foreground: 240 5.9% 10%;
20-
--destructive: 0 84.2% 60.2%;
21-
--destructive-foreground: 0 0% 98%;
22-
--border: 240 5.9% 90%;
23-
--input: 240 5.9% 90%;
24-
--ring: 240 10% 3.9%;
25-
--chart-1: 12 76% 61%;
26-
--chart-2: 173 58% 39%;
27-
--chart-3: 197 37% 24%;
28-
--chart-4: 43 74% 66%;
29-
--chart-5: 27 87% 67%;
30-
--radius: 0.5rem;
31-
}
32-
.dark {
33-
--background: 240 10% 3.9%;
6+
--background: 226.51 59% 21%;
347
--foreground: 0 0% 98%;
35-
--card: 240 10% 3.9%;
8+
--card: 226.51 59% 21%;
369
--card-foreground: 0 0% 98%;
37-
--popover: 240 10% 3.9%;
10+
--popover: 226.51 59% 21%;
3811
--popover-foreground: 0 0% 98%;
3912
--primary: 0 0% 98%;
4013
--primary-foreground: 240 5.9% 10%;
@@ -54,6 +27,7 @@
5427
--chart-3: 30 80% 55%;
5528
--chart-4: 280 65% 60%;
5629
--chart-5: 340 75% 55%;
30+
--radius: 0.5rem;
5731
}
5832
}
5933

0 commit comments

Comments
 (0)