From 404f1a2f8c6c2337b6100fbeaaf432a031fe15e5 Mon Sep 17 00:00:00 2001 From: Willem-Jaap Date: Sat, 8 Jun 2024 20:11:49 +0200 Subject: [PATCH 1/3] refactor: use `next/font` for more optimized font loading --- src/app/global.css | 2 -- src/app/layout.js | 15 +++++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/app/global.css b/src/app/global.css index 463508be..b5c61c95 100644 --- a/src/app/global.css +++ b/src/app/global.css @@ -1,5 +1,3 @@ -@import url("https://fonts.bunny.net/css2?family=Nunito:wght@400;600;700&display=swap"); - @tailwind base; @tailwind components; @tailwind utilities; diff --git a/src/app/layout.js b/src/app/layout.js index ccc84081..1b4efe2c 100644 --- a/src/app/layout.js +++ b/src/app/layout.js @@ -1,14 +1,21 @@ +import { Nunito } from 'next/font/google' import '@/app/global.css' -export const metadata = { - title: 'Laravel', -} +const nunitoFont = Nunito({ + subsets: ['latin'], + display: 'swap', +}) + const RootLayout = ({ children }) => { return ( - + {children} ) } +export const metadata = { + title: 'Laravel', +} + export default RootLayout From 8d84db2ea7fdae80a94ca2db37ce93d1e9b836ce Mon Sep 17 00:00:00 2001 From: Willem-Jaap Date: Sat, 8 Jun 2024 20:12:38 +0200 Subject: [PATCH 2/3] fix: update tailwind configuration to v3, remove unneeded properties & font @see https://tailwindcss.com/docs/upgrade-guide --- tailwind.config.js | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/tailwind.config.js b/tailwind.config.js index a373d2b4..ae553f60 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,19 +1,5 @@ -const defaultTheme = require('tailwindcss/defaultTheme') - module.exports = { - content: ['./src/**/*.js'], - darkMode: 'media', - theme: { - extend: { - fontFamily: { - sans: ['Nunito', ...defaultTheme.fontFamily.sans], - }, - }, - }, - variants: { - extend: { - opacity: ['disabled'], - }, - }, + content: ['./src/**/*.{js,jsx,ts,tsx}'], + theme: {}, plugins: [require('@tailwindcss/forms')], } From d65d8aa4d342076babf19b160a95b2f5cbe0f7ef Mon Sep 17 00:00:00 2001 From: Willem-Jaap Date: Sat, 8 Jun 2024 20:37:26 +0200 Subject: [PATCH 3/3] fix: remove font-sans classname --- src/app/(auth)/layout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/(auth)/layout.js b/src/app/(auth)/layout.js index ae2ae81b..c7c9b62e 100644 --- a/src/app/(auth)/layout.js +++ b/src/app/(auth)/layout.js @@ -9,7 +9,7 @@ export const metadata = { const Layout = ({ children }) => { return (
-
+