diff --git a/app/[lang]/(live)/(public)/[contentType]/[uid]/layout.tsx b/app/[lang]/(live)/(public)/[contentType]/[uid]/layout.tsx index 05c6e832c..e2088d287 100644 --- a/app/[lang]/(live)/(public)/[contentType]/[uid]/layout.tsx +++ b/app/[lang]/(live)/(public)/[contentType]/[uid]/layout.tsx @@ -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 { @@ -11,29 +7,10 @@ import { UIDParams, } 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({ children, - params, }: React.PropsWithChildren< LayoutArgs >) { - return ( -
- {children} -
- ) + return
{children}
} diff --git a/app/[lang]/(live)/fonts.ts b/app/[lang]/(live)/fonts.ts index 871c35570..73cbdf3a1 100644 --- a/app/[lang]/(live)/fonts.ts +++ b/app/[lang]/(live)/fonts.ts @@ -1,4 +1,5 @@ import { Fira_Mono, Fira_Sans } from "next/font/google" +import localFont from "next/font/local" export const firaMono = Fira_Mono({ subsets: ["latin"], @@ -11,3 +12,14 @@ export const firaSans = Fira_Sans({ weight: ["300", "400", "600", "900"], 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", +}) diff --git a/app/[lang]/(live)/layout.tsx b/app/[lang]/(live)/layout.tsx index 34e4cf3b5..40605c7cf 100644 --- a/app/[lang]/(live)/layout.tsx +++ b/app/[lang]/(live)/layout.tsx @@ -8,6 +8,8 @@ import TrpcProvider from "@/lib/trpc/Provider" import AdobeScript from "@/components/Current/AdobeScript" import VwoScript from "@/components/Current/VwoScript" +import { biroScriptPlus, firaMono, firaSans } from "./fonts" + import type { Metadata } from "next" import type { LangParams, LayoutArgs } from "@/types/params" @@ -42,7 +44,9 @@ export default async function RootLayout({ - + {children}