From 1fe060106dde1377a9f69353a4c9222cee4808a1 Mon Sep 17 00:00:00 2001 From: Ethan Date: Mon, 29 Jul 2024 22:55:39 +1000 Subject: [PATCH] feat: Migrate Google Fonts to next/font and update global styles - Replaced tags with next/font to load Roboto and Poppins fonts in app/layout.tsx - Updated global.css to ensure the correct application of Roboto and Poppins fonts - Modified GlobalStyles to include both Roboto and Poppins fonts - Ensured consistent font usage across the application Resolve CP-47. --- src/app/global.css | 2 +- src/app/layout.tsx | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/app/global.css b/src/app/global.css index 6ea7928..5f4b88a 100644 --- a/src/app/global.css +++ b/src/app/global.css @@ -2,7 +2,7 @@ body { margin: 0px; height: 100%; overflow: hidden; - font-family: 'Manrope', sans-serif; + font-family: 'Roboto', 'Poppins', 'Manrope', sans-serif; font-weight: 400; background-color: #16142a; -webkit-font-smoothing: antialiased; diff --git a/src/app/layout.tsx b/src/app/layout.tsx index b67e8cb..57f05e9 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -3,6 +3,17 @@ import Providers from './provider'; import './global.css'; import 'bootstrap/dist/css/bootstrap.css'; import ThemeProvider from './themeProvider'; +import { Roboto, Poppins } from 'next/font/google'; + +const roboto = Roboto({ + weight: ['100', '300', '400', '500', '700', '900'], + subsets: ['latin', 'latin-ext'], +}); + +const poppins = Poppins({ + weight: ['100', '200', '300', '400', '500', '600', '700', '800', '900'], + subsets: ['latin', 'latin-ext'], +}); export const metadata = { title: 'BeeQuant Platform', @@ -11,7 +22,7 @@ export const metadata = { export default function RootLayout({ children }: { children: ReactNode }) { return ( - +