From 9b295d0126823c0d3f1f1a2c114b5d5340a56988 Mon Sep 17 00:00:00 2001 From: Christel Westerberg Date: Wed, 22 May 2024 16:51:10 +0200 Subject: [PATCH] fix: move fonts --- app/[lang]/(live)/(protected)/my-pages/layout.tsx | 2 +- app/[lang]/(live)/error.tsx | 2 +- app/[lang]/(live)/layout.tsx | 3 +-- app/[lang]/(live)/middleware-error/[status]/page.tsx | 2 +- app/[lang]/{(live) => }/fonts.ts | 0 app/[lang]/webview/layout.tsx | 4 ++-- app/global-error.tsx | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-) rename app/[lang]/{(live) => }/fonts.ts (100%) diff --git a/app/[lang]/(live)/(protected)/my-pages/layout.tsx b/app/[lang]/(live)/(protected)/my-pages/layout.tsx index d9d38fe0e..f5965b1fd 100644 --- a/app/[lang]/(live)/(protected)/my-pages/layout.tsx +++ b/app/[lang]/(live)/(protected)/my-pages/layout.tsx @@ -1,4 +1,4 @@ -import { firaMono, firaSans } from "@/app/[lang]/(live)/fonts" +import { firaMono, firaSans } from "@/app/[lang]/fonts" import styles from "./layout.module.css" diff --git a/app/[lang]/(live)/error.tsx b/app/[lang]/(live)/error.tsx index 0cdfc5a7d..620ae5c4a 100644 --- a/app/[lang]/(live)/error.tsx +++ b/app/[lang]/(live)/error.tsx @@ -7,7 +7,7 @@ import { findLang } from "@/constants/languages" import { login } from "@/constants/routes/handleAuth" import { SESSION_EXPIRED } from "@/server/errors/trpc" -import { firaMono, firaSans } from "@/app/[lang]/(live)/fonts" +import { firaMono, firaSans } from "@/app/[lang]/fonts" import styles from "./error.module.css" diff --git a/app/[lang]/(live)/layout.tsx b/app/[lang]/(live)/layout.tsx index 40605c7cf..8739a23d3 100644 --- a/app/[lang]/(live)/layout.tsx +++ b/app/[lang]/(live)/layout.tsx @@ -5,11 +5,10 @@ import Script from "next/script" import TrpcProvider from "@/lib/trpc/Provider" +import { biroScriptPlus, firaMono, firaSans } from "@/app/[lang]/fonts" 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" diff --git a/app/[lang]/(live)/middleware-error/[status]/page.tsx b/app/[lang]/(live)/middleware-error/[status]/page.tsx index d05de5699..071b85436 100644 --- a/app/[lang]/(live)/middleware-error/[status]/page.tsx +++ b/app/[lang]/(live)/middleware-error/[status]/page.tsx @@ -1,4 +1,4 @@ -import { firaMono, firaSans } from "@/app/[lang]/(live)/fonts" +import { firaMono, firaSans } from "@/app/[lang]/fonts" import styles from "./page.module.css" diff --git a/app/[lang]/(live)/fonts.ts b/app/[lang]/fonts.ts similarity index 100% rename from app/[lang]/(live)/fonts.ts rename to app/[lang]/fonts.ts diff --git a/app/[lang]/webview/layout.tsx b/app/[lang]/webview/layout.tsx index 77b081954..bf9ccb5b0 100644 --- a/app/[lang]/webview/layout.tsx +++ b/app/[lang]/webview/layout.tsx @@ -1,7 +1,7 @@ import "@/app/globals.css" import "@scandic-hotels/design-system/style.css" -import { firaMono, firaSans } from "@/app/[lang]/(live)/fonts" +import { biroScriptPlus, firaMono, firaSans } from "@/app/[lang]/fonts" import styles from "./layout.module.css" @@ -20,7 +20,7 @@ export default function RootLayout({ return ( {children} diff --git a/app/global-error.tsx b/app/global-error.tsx index 306af9bfe..e25b624bf 100644 --- a/app/global-error.tsx +++ b/app/global-error.tsx @@ -1,6 +1,6 @@ "use client" -import { firaMono, firaSans } from "@/app/[lang]/(live)/fonts" +import { firaMono, firaSans } from "@/app/[lang]/fonts" import styles from "./global-error.module.css"