From 0138a98ec2633217dd10fbb2849df64a8d46b0b8 Mon Sep 17 00:00:00 2001 From: Florian Trayon <26360935+FlorianLeChat@users.noreply.github.com> Date: Sat, 21 Oct 2023 11:03:54 +0200 Subject: [PATCH] Fixed usage of legacy font on related pages --- app/[locale]/layout.tsx | 11 +++++++---- app/[locale]/styles/globals.scss | 1 + app/[locale]/styles/legacy.scss | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/[locale]/layout.tsx b/app/[locale]/layout.tsx index cc1df88..ef4483a 100644 --- a/app/[locale]/layout.tsx +++ b/app/[locale]/layout.tsx @@ -11,8 +11,8 @@ import { join } from "path"; import { Poppins, Open_Sans } from "next/font/google"; import { promises as fileSystem } from "fs"; import { unstable_setRequestLocale } from "next-intl/server"; -import { Suspense, lazy, type ReactNode } from "react"; import { NextIntlClientProvider, useMessages } from "next-intl"; +import { Suspense, lazy, type ReactNode, type CSSProperties } from "react"; // Importation des types. import type { Metadata } from "next"; @@ -196,9 +196,12 @@ export default function Layout( { return ( {/* Corps de la page */} diff --git a/app/[locale]/styles/globals.scss b/app/[locale]/styles/globals.scss index 7b3823d..8654b35 100644 --- a/app/[locale]/styles/globals.scss +++ b/app/[locale]/styles/globals.scss @@ -37,6 +37,7 @@ body max-width: 1024px; transition: background-color 100ms linear; line-height: 1.5; + font-family: var(--modern-font); @include themeColors() { diff --git a/app/[locale]/styles/legacy.scss b/app/[locale]/styles/legacy.scss index 4466df6..cf01bbd 100644 --- a/app/[locale]/styles/legacy.scss +++ b/app/[locale]/styles/legacy.scss @@ -48,7 +48,7 @@ html color: white; hyphens: auto; text-align: center; - font-family: "Open Sans", sans-serif; + font-family: var(--legacy-font), sans-serif; text-rendering: optimizeSpeed; // Disposition et affichage.