tabshift/payloadcms
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

chore(next): installs merriweather as google font and removes static assets

Browse Source
This commit is contained in:
Jacob Fletcher
2024-04-11 15:31:19 -04:00
parent 1119cf3af9
commit 432dfef435
15 changed files with 12 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/next/src/layouts/Root/index.tsx
View File

@@ -22,6 +22,16 @@ export const metadata = {
title: 'Next.js', title: 'Next.js',
} }
import { Merriweather } from 'next/font/google'
const merriweather = Merriweather({
display: 'swap',
style: ['normal', 'italic'],
subsets: ['latin'],
variable: '--font-serif',
weight: ['400', '900'],
})
export const RootLayout = async ({ export const RootLayout = async ({
children, children,
config: configPromise, config: configPromise,
@@ -82,7 +92,7 @@ export const RootLayout = async ({
}) })
return ( return (
<html dir={dir} lang={languageCode}> <html className={merriweather.variable} dir={dir} lang={languageCode}>
<body> <body>
<RootProvider <RootProvider
componentMap={componentMap} componentMap={componentMap}

1
packages/next/src/scss/app.scss
View File

@@ -22,7 +22,6 @@
--theme-baseline-body-size: #{$baseline-body-size}; --theme-baseline-body-size: #{$baseline-body-size};
--font-body: 'Suisse Intl', system-ui; --font-body: 'Suisse Intl', system-ui;
--font-mono: monospace; --font-mono: monospace;
--font-serif: 'Merriweather', serif;
--style-radius-s: #{$style-radius-s}; --style-radius-s: #{$style-radius-s};
--style-radius-m: #{$style-radius-m}; --style-radius-m: #{$style-radius-m};

1
packages/richtext-lexical/src/scss/app.scss
View File

@@ -22,7 +22,6 @@
--theme-baseline-body-size: #{$baseline-body-size}; --theme-baseline-body-size: #{$baseline-body-size};
--font-body: 'Suisse Intl', system-ui; --font-body: 'Suisse Intl', system-ui;
--font-mono: monospace; --font-mono: monospace;
--font-serif: 'Merriweather', serif;
--style-radius-s: #{$style-radius-s}; --style-radius-s: #{$style-radius-s};
--style-radius-m: #{$style-radius-m}; --style-radius-m: #{$style-radius-m};

1
packages/richtext-slate/src/scss/app.scss
View File

@@ -22,7 +22,6 @@
--theme-baseline-body-size: #{$baseline-body-size}; --theme-baseline-body-size: #{$baseline-body-size};
--font-body: 'Suisse Intl', system-ui; --font-body: 'Suisse Intl', system-ui;
--font-mono: monospace; --font-mono: monospace;
--font-serif: 'Merriweather', serif;
--style-radius-s: #{$style-radius-s}; --style-radius-s: #{$style-radius-s};
--style-radius-m: #{$style-radius-m}; --style-radius-m: #{$style-radius-m};

BIN
packages/ui/src/assets/fonts/merriweather-v30-latin-900.woff
View File

Binary file not shown.

BIN
packages/ui/src/assets/fonts/merriweather-v30-latin-900.woff2
View File

Binary file not shown.

BIN
packages/ui/src/assets/fonts/merriweather-v30-latin-900italic.woff
View File

Binary file not shown.

BIN
packages/ui/src/assets/fonts/merriweather-v30-latin-900italic.woff2
View File

Binary file not shown.

BIN
packages/ui/src/assets/fonts/merriweather-v30-latin-italic.woff
View File

Binary file not shown.

BIN
packages/ui/src/assets/fonts/merriweather-v30-latin-italic.woff2
View File

Binary file not shown.

BIN
packages/ui/src/assets/fonts/merriweather-v30-latin-regular.woff
View File

Binary file not shown.

BIN
packages/ui/src/assets/fonts/merriweather-v30-latin-regular.woff2
View File

Binary file not shown.

2
packages/ui/src/scss/app.scss
View File

@@ -1,4 +1,3 @@
@import 'fonts';
@import 'styles'; @import 'styles';
@import './toastify.scss'; @import './toastify.scss';
@import './colors.scss'; @import './colors.scss';
@@ -22,7 +21,6 @@
--theme-baseline-body-size: #{$baseline-body-size}; --theme-baseline-body-size: #{$baseline-body-size};
--font-body: 'Suisse Intl', system-ui; --font-body: 'Suisse Intl', system-ui;
--font-mono: monospace; --font-mono: monospace;
--font-serif: 'Merriweather', serif;
--style-radius-s: #{$style-radius-s}; --style-radius-s: #{$style-radius-s};
--style-radius-m: #{$style-radius-m}; --style-radius-m: #{$style-radius-m};

40
packages/ui/src/scss/fonts.scss
View File

@@ -33,43 +33,3 @@
font-weight: bold; font-weight: bold;
font-style: normal; font-style: normal;
} }
@font-face {
font-family: 'Merriweather';
font-style: normal;
font-weight: 400;
src:
local(''),
url('../assets/fonts/merriweather-v30-latin-regular.woff2') format('woff2'),
url('../assets/fonts/merriweather-v30-latin-regular.woff') format('woff');
}
@font-face {
font-family: 'Merriweather';
font-style: italic;
font-weight: 400;
src:
local(''),
url('../assets/fonts/merriweather-v30-latin-italic.woff2') format('woff2'),
url('../assets/fonts/merriweather-v30-latin-italic.woff') format('woff');
}
@font-face {
font-family: 'Merriweather';
font-style: normal;
font-weight: 900;
src:
local(''),
url('../assets/fonts/merriweather-v30-latin-900.woff2') format('woff2'),
url('../assets/fonts/merriweather-v30-latin-900.woff') format('woff');
}
@font-face {
font-family: 'Merriweather';
font-style: italic;
font-weight: 900;
src:
local(''),
url('../assets/fonts/merriweather-v30-latin-900italic.woff2') format('woff2'),
url('../assets/fonts/merriweather-v30-latin-900italic.woff') format('woff');
}

2
tsconfig.json
View File

@@ -161,4 +161,4 @@
".next/types/**/*.ts", ".next/types/**/*.ts",
"scripts/**/*.ts" "scripts/**/*.ts"
] ]
} }