diff --git a/src/app/[locale]/layout.tsx b/src/app/[locale]/layout.tsx index 179ce7e..5e9ba32 100644 --- a/src/app/[locale]/layout.tsx +++ b/src/app/[locale]/layout.tsx @@ -1,10 +1,9 @@ -import { fontDMSans, fontSourceSans, fontSourceSerif4 } from '@/assets/fonts'; -import { TailwindIndicator } from '@/components/tailwind-indicator'; +import { fontBricolageGrotesque, fontSourceSerif4 } from '@/assets/fonts'; import { routing } from '@/i18n/routing'; import { cn } from '@/lib/utils'; import { GeistMono } from 'geist/font/mono'; import { GeistSans } from 'geist/font/sans'; -import { Locale, hasLocale, NextIntlClientProvider } from 'next-intl'; +import { hasLocale, Locale, NextIntlClientProvider } from 'next-intl'; import { notFound } from 'next/navigation'; import { ReactNode } from 'react'; import { Toaster } from 'sonner'; @@ -41,10 +40,8 @@ export default async function LocaleLayout({ suppressHydrationWarning className={cn( 'size-full antialiased', - fontDMSans.className, - fontDMSans.variable, + fontBricolageGrotesque.className, fontSourceSerif4.variable, - fontSourceSans.variable, GeistSans.variable, GeistMono.variable )} diff --git a/src/assets/fonts/bricolage-grotesque-v7-latin-regular.woff2 b/src/assets/fonts/bricolage-grotesque-v7-latin-regular.woff2 new file mode 100644 index 0000000..8981203 Binary files /dev/null and b/src/assets/fonts/bricolage-grotesque-v7-latin-regular.woff2 differ diff --git a/src/assets/fonts/dm-sans-v15-latin-regular.woff2 b/src/assets/fonts/dm-sans-v15-latin-regular.woff2 deleted file mode 100644 index bedfe7d..0000000 Binary files a/src/assets/fonts/dm-sans-v15-latin-regular.woff2 and /dev/null differ diff --git a/src/assets/fonts/index.ts b/src/assets/fonts/index.ts index a877dce..7d74381 100644 --- a/src/assets/fonts/index.ts +++ b/src/assets/fonts/index.ts @@ -10,16 +10,10 @@ import { Source_Serif_4 } from 'next/font/google'; * 2. Add font file to the assets/fonts folder * 3. Add font variable to the font object */ -// https://gwfh.mranftl.com/fonts/source-sans-3?subsets=latin -export const fontSourceSans = localFont({ - src: './source-sans-3-v15-latin-regular.woff2', - variable: '--font-source-sans', -}); - -// https://gwfh.mranftl.com/fonts/dm-sans?subsets=latin -export const fontDMSansRegular = localFont({ - src: './dm-sans-v15-latin-regular.woff2', - variable: '--font-dm-sans-regular', +// https://gwfh.mranftl.com/fonts/bricolage-grotesque?subsets=latin +export const fontBricolageGrotesque = localFont({ + src: './bricolage-grotesque-v7-latin-regular.woff2', + variable: '--font-bricolage-grotesque', }); // https://gwfh.mranftl.com/fonts/dm-sans?subsets=latin @@ -29,12 +23,6 @@ export const fontDMSans = localFont({ variable: '--font-dm-sans', }); -// https://gwfh.mranftl.com/fonts/dm-serif-display?subsets=latin -// export const fontDMSerifDisplay = localFont({ -// src: './dm-serif-display-v15-latin-regular.woff2', -// variable: '--font-dm-serif-display', -// }); - /** * [2] use google font * diff --git a/src/assets/fonts/source-sans-3-v15-latin-regular.woff2 b/src/assets/fonts/source-sans-3-v15-latin-regular.woff2 deleted file mode 100644 index c77d9e3..0000000 Binary files a/src/assets/fonts/source-sans-3-v15-latin-regular.woff2 and /dev/null differ diff --git a/src/assets/fonts/source-serif-4-v8-latin-regular.woff2 b/src/assets/fonts/source-serif-4-v8-latin-regular.woff2 deleted file mode 100644 index bab3088..0000000 Binary files a/src/assets/fonts/source-serif-4-v8-latin-regular.woff2 and /dev/null differ diff --git a/tailwind.config.ts b/tailwind.config.ts index d9af330..3ae01e9 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -18,6 +18,9 @@ export default { ], serif: [ 'var(--font-source-serif)' + ], + bricolage: [ + 'var(--font-bricolage-grotesque)' ] }, colors: {