scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: refactor fonts handling

Browse Source
This commit is contained in:
Christel Westerberg
2024-05-21 16:51:35 +02:00
parent a19b0687bb
commit 7549ca633e
3 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/[lang]/(live)/(public)/[contentType]/[uid]/layout.tsx
View File

@@ -1,7 +1,3 @@
import localFont from "next/font/local"
import { firaMono, firaSans } from "@/app/[lang]/(live)/fonts"
import styles from "./layout.module.css" import styles from "./layout.module.css"
import { import {
@@ -11,29 +7,10 @@ import {
UIDParams, UIDParams,
} from "@/types/params" } from "@/types/params"
// Font files can be colocated inside of `app`
const biroScriptPlus = localFont({
src: [
{
path: "../../../../../../public/_static/fonts/biro-script-plus/Biro-Script-Plus.ttf",
style: "normal",
weight: "500",
},
],
variable: "--ff-biro-script-plus",
})
export default function ContentTypeLayout({ export default function ContentTypeLayout({
children, children,
params,
}: React.PropsWithChildren< }: React.PropsWithChildren<
LayoutArgs<LangParams & ContentTypeParams & UIDParams> LayoutArgs<LangParams & ContentTypeParams & UIDParams>
>) { >) {
return ( return <div className={styles.layout}>{children}</div>
<div
className={`${firaMono.variable} ${firaSans.variable} ${biroScriptPlus.variable} ${styles.layout}`}
>
{children}
</div>
)
} }

12
app/[lang]/(live)/fonts.ts
View File

@@ -1,4 +1,5 @@
import { Fira_Mono, Fira_Sans } from "next/font/google" import { Fira_Mono, Fira_Sans } from "next/font/google"
import localFont from "next/font/local"
export const firaMono = Fira_Mono({ export const firaMono = Fira_Mono({
subsets: ["latin"], subsets: ["latin"],
@@ -11,3 +12,14 @@ export const firaSans = Fira_Sans({
weight: ["300", "400", "600", "900"], weight: ["300", "400", "600", "900"],
variable: "--ff-fira-sans", variable: "--ff-fira-sans",
}) })
export const biroScriptPlus = localFont({
src: [
{
path: "../../../public/_static/fonts/biro-script-plus/Biro-Script-Plus.ttf",
style: "normal",
weight: "500",
},
],
variable: "--ff-biro-script-plus",
})

6
app/[lang]/(live)/layout.tsx
View File

@@ -8,6 +8,8 @@ import TrpcProvider from "@/lib/trpc/Provider"
import AdobeScript from "@/components/Current/AdobeScript" import AdobeScript from "@/components/Current/AdobeScript"
import VwoScript from "@/components/Current/VwoScript" import VwoScript from "@/components/Current/VwoScript"
import { biroScriptPlus, firaMono, firaSans } from "./fonts"
import type { Metadata } from "next" import type { Metadata } from "next"
import type { LangParams, LayoutArgs } from "@/types/params" import type { LangParams, LayoutArgs } from "@/types/params"
@@ -42,7 +44,9 @@ export default async function RootLayout({
<AdobeScript /> <AdobeScript />
<VwoScript /> <VwoScript />
</head> </head>
<body> <body
className={`${firaMono.variable} ${firaSans.variable} ${biroScriptPlus.variable} `}
>
<TrpcProvider lang={params.lang}>{children}</TrpcProvider> <TrpcProvider lang={params.lang}>{children}</TrpcProvider>
<Script id="page-tracking">{` <Script id="page-tracking">{`
typeof _satellite !== "undefined" && _satellite.pageBottom(); typeof _satellite !== "undefined" && _satellite.pageBottom();