From eb84ec37eee51a1493d031fc274aaf64afa950c9 Mon Sep 17 00:00:00 2001 From: Jake Jarvis Date: Thu, 10 Apr 2025 20:23:34 -0400 Subject: [PATCH] fix font css vars --- .env.example | 8 +-- app/fonts.ts | 2 + app/global.css | 6 +- app/layout.module.css | 4 -- app/layout.tsx | 26 ++++---- components/Heading/Heading.module.css | 6 +- .../SkipNav.module.css} | 5 +- .../SkipToContent.tsx => SkipNav/SkipNav.tsx} | 8 +-- components/SkipNav/index.ts | 2 + components/SkipToContent/index.ts | 2 - instrumentation.ts | 8 ++- lib/helpers/styles.ts | 14 ----- pnpm-lock.yaml | 62 +++++++++---------- 13 files changed, 71 insertions(+), 82 deletions(-) rename components/{SkipToContent/SkipToContent.module.css => SkipNav/SkipNav.module.css} (76%) rename components/{SkipToContent/SkipToContent.tsx => SkipNav/SkipNav.tsx} (53%) create mode 100644 components/SkipNav/index.ts delete mode 100644 components/SkipToContent/index.ts delete mode 100644 lib/helpers/styles.ts diff --git a/.env.example b/.env.example index 2693a05a..850b4ee6 100644 --- a/.env.example +++ b/.env.example @@ -6,13 +6,13 @@ GITHUB_TOKEN= KV_REST_API_TOKEN= KV_REST_API_URL= +RESEND_API_KEY= +RESEND_FROM_EMAIL= +RESEND_TO_EMAIL= +TURNSTILE_SECRET_KEY= NEXT_PUBLIC_GISCUS_CATEGORY_ID= NEXT_PUBLIC_GISCUS_REPO_ID= NEXT_PUBLIC_ONION_DOMAIN= NEXT_PUBLIC_TURNSTILE_SITE_KEY= NEXT_PUBLIC_UMAMI_URL= NEXT_PUBLIC_UMAMI_WEBSITE_ID= -RESEND_API_KEY= -RESEND_FROM_EMAIL= -RESEND_TO_EMAIL= -TURNSTILE_SECRET_KEY= diff --git a/app/fonts.ts b/app/fonts.ts index f6a36961..548cac31 100644 --- a/app/fonts.ts +++ b/app/fonts.ts @@ -11,6 +11,7 @@ export const GeistSans = GeistSansLoader({ "system-ui", "sans-serif", ], + variable: "--fonts-sans", preload: true, }); @@ -28,5 +29,6 @@ export const GeistMono = GeistMonoLoader({ "monospace", ], adjustFontFallback: false, + variable: "--fonts-mono", preload: true, }); diff --git a/app/global.css b/app/global.css index 23926951..e9b96424 100644 --- a/app/global.css +++ b/app/global.css @@ -1,4 +1,7 @@ -/*! Adapted from modern-normalize.css | MIT License | https://github.com/sindresorhus/modern-normalize */ +/*! + * modern-normalize v3.0.1 | MIT License | https://github.com/sindresorhus/modern-normalize/tree/v3.0.1 + */ + *, ::before, ::after { @@ -15,6 +18,7 @@ html { body { margin: 0; font-family: var(--fonts-sans); + background-color: var(--colors-background-inner); } code, diff --git a/app/layout.module.css b/app/layout.module.css index 3331a314..2648716e 100644 --- a/app/layout.module.css +++ b/app/layout.module.css @@ -1,7 +1,3 @@ -.body { - background-color: var(--colors-background-inner); -} - .layout { display: flex; flex-direction: column; diff --git a/app/layout.tsx b/app/layout.tsx index a9f908f4..abe061e0 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,11 +1,11 @@ import { JsonLd } from "react-schemaorg"; +import clsx from "clsx"; import Analytics from "./analytics"; import { ThemeProvider, ThemeScript } from "../contexts/ThemeContext"; import Header from "../components/Header"; import Footer from "../components/Footer"; -import { SkipToContentLink, SkipToContentTarget } from "../components/SkipToContent"; +import { SkipNavLink, SkipNavTarget } from "../components/SkipNav"; import { defaultMetadata } from "../lib/helpers/metadata"; -import { setRootCssVariables } from "../lib/helpers/styles"; import * as config from "../lib/config"; import { BASE_URL, MAX_WIDTH } from "../lib/config/constants"; import type { Metadata } from "next"; @@ -69,25 +69,21 @@ const RootLayout = ({ children }: Readonly<{ children: React.ReactNode }>) => { /> - -