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

fix: move fonts

Browse Source
This commit is contained in:
Christel Westerberg
2024-05-22 16:51:10 +02:00
parent c36578a83f
commit 9b295d0126
7 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/[lang]/(live)/(protected)/my-pages/layout.tsx
View File

@@ -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" import styles from "./layout.module.css"

2
app/[lang]/(live)/error.tsx
View File

@@ -7,7 +7,7 @@ import { findLang } from "@/constants/languages"
import { login } from "@/constants/routes/handleAuth" import { login } from "@/constants/routes/handleAuth"
import { SESSION_EXPIRED } from "@/server/errors/trpc" 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" import styles from "./error.module.css"

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

@@ -5,11 +5,10 @@ import Script from "next/script"
import TrpcProvider from "@/lib/trpc/Provider" import TrpcProvider from "@/lib/trpc/Provider"
import { biroScriptPlus, firaMono, firaSans } from "@/app/[lang]/fonts"
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"

2
app/[lang]/(live)/middleware-error/[status]/page.tsx
View File

@@ -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" import styles from "./page.module.css"

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

4
app/[lang]/webview/layout.tsx
View File

@@ -1,7 +1,7 @@
import "@/app/globals.css" import "@/app/globals.css"
import "@scandic-hotels/design-system/style.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" import styles from "./layout.module.css"
@@ -20,7 +20,7 @@ export default function RootLayout({
return ( return (
<html lang={params.lang}> <html lang={params.lang}>
<body <body
className={`${firaMono.variable} ${firaSans.variable} ${styles.layout}`} className={`${firaMono.variable} ${firaSans.variable} ${biroScriptPlus.variable} ${styles.layout}`}
> >
{children} {children}
</body> </body>

2
app/global-error.tsx
View File

@@ -1,6 +1,6 @@
"use client" "use client"
import { firaMono, firaSans } from "@/app/[lang]/(live)/fonts" import { firaMono, firaSans } from "@/app/[lang]/fonts"
import styles from "./global-error.module.css" import styles from "./global-error.module.css"