From c2715c0700b7b75f649e1842bdb61118e2c70aab Mon Sep 17 00:00:00 2001 From: Mikael Brevik Date: Wed, 11 Dec 2024 13:30:44 +0100 Subject: [PATCH] fix: language html attribute issue --- src/app/(main)/[locale]/layout.tsx | 58 +++++++++++++++++------------- src/app/{ => shared}/layout.tsx | 14 ++------ src/app/studio/layout.tsx | 20 +++++++++++ 3 files changed, 55 insertions(+), 37 deletions(-) rename src/app/{ => shared}/layout.tsx (55%) create mode 100644 src/app/studio/layout.tsx diff --git a/src/app/(main)/[locale]/layout.tsx b/src/app/(main)/[locale]/layout.tsx index 3852b5123..61d2842a8 100644 --- a/src/app/(main)/[locale]/layout.tsx +++ b/src/app/(main)/[locale]/layout.tsx @@ -1,3 +1,4 @@ +import localFont from "next/font/local"; import { draftMode } from "next/headers"; import { notFound } from "next/navigation"; import { NextIntlClientProvider } from "next-intl"; @@ -26,6 +27,11 @@ import { import { loadStudioQuery } from "studio/lib/store"; import "src/styles/global.css"; +const fontBrittiSans = localFont({ + src: "../../../../public/_assets/britti-sans-variable.woff2", + variable: "--font-britti-sans", +}); + const hasValidData = (data: unknown) => data && Object.keys(data).length > 0; export default async function Layout({ @@ -76,30 +82,32 @@ export default async function Layout({ const hasFooterData = hasNavData && initialNav.data.footer; return ( -
- - - {children} - {hasFooterData && isDraftMode ? ( - - ) : ( -
- )} - {draftMode().isEnabled && } - -
+ + + + + {children} + {hasFooterData && isDraftMode ? ( + + ) : ( +