From b1e80364fb318095ee23cc627fc273200e9290ad Mon Sep 17 00:00:00 2001 From: Ane Date: Fri, 27 Sep 2024 13:49:23 +0200 Subject: [PATCH] resolve conflict --- .storybook/preview.tsx | 2 +- .../{fonts => _assets}/britti-sans-variable.woff2 | Bin src/app/layout.tsx | 14 +------------- 3 files changed, 2 insertions(+), 14 deletions(-) rename public/{fonts => _assets}/britti-sans-variable.woff2 (100%) diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx index 735d73eb0..a2e7be0c4 100644 --- a/.storybook/preview.tsx +++ b/.storybook/preview.tsx @@ -4,7 +4,7 @@ import "../src/styles/global.css"; import localFont from "next/font/local"; const fontBrittiSans = localFont({ - src: "../../public/fonts/britti-sans-variable.woff2", + src: "../../public/_assets/britti-sans-variable.woff2", variable: "--font-britti-sans", }); diff --git a/public/fonts/britti-sans-variable.woff2 b/public/_assets/britti-sans-variable.woff2 similarity index 100% rename from public/fonts/britti-sans-variable.woff2 rename to public/_assets/britti-sans-variable.woff2 diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 3dafdf538..572dec0e9 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -10,21 +10,9 @@ import { loadStudioQuery } from "studio/lib/store"; import "src/styles/global.css"; -<<<<<<< HEAD const fontBrittiSans = localFont({ src: "../../public/_assets/fonts/britti-sans-variable.woff2", variable: "--font-britti-sans", -======= -const fontRecoleta = localFont({ - src: "../../public/_assets/recoleta.otf", - variable: "--font-recoleta", -}); - -const fontFigtree = Figtree({ - subsets: ["latin"], - weight: "400", - variable: "--font-figtree", ->>>>>>> v3 }); export async function generateMetadata(): Promise { @@ -50,7 +38,7 @@ export default async function RootLayout({ } return ( - + {children} {draftMode().isEnabled && }