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

chore(ui): removes all static font assets (#5821)

Browse Source
This commit is contained in:
Jacob Fletcher
2024-04-12 09:57:31 -04:00
committed by GitHub
parent 4328060637 ff5e438d6d
commit 94c0095b3b
30 changed files with 23 additions and 341 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}

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

@@ -1,4 +1,3 @@
@import './fonts.scss';
@import './styles.scss'; @import './styles.scss';
@import './toastify.scss'; @import './toastify.scss';
@import './colors.scss'; @import './colors.scss';
@@ -20,9 +19,9 @@
--theme-overlay: rgba(5, 5, 5, 0.5); --theme-overlay: rgba(5, 5, 5, 0.5);
--theme-baseline: #{$baseline-px}; --theme-baseline: #{$baseline-px};
--theme-baseline-body-size: #{$baseline-body-size}; --theme-baseline-body-size: #{$baseline-body-size};
--font-body: 'Suisse Intl', system-ui; --font-body: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial,
sans-serif;
--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};

75
packages/next/src/scss/fonts.scss
View File

@@ -1,75 +0,0 @@
@font-face {
font-family: 'Suisse Intl';
src:
url('../assets/fonts/SuisseIntl.woff2') format('woff2'),
url('../assets/fonts/SuisseIntl.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Suisse Intl';
src:
url('../assets/fonts/SuisseIntl-Medium.woff2') format('woff2'),
url('../assets/fonts/SuisseIntl-Medium.woff') format('woff');
font-weight: 500;
font-style: normal;
}
@font-face {
font-family: 'Suisse Intl';
src:
url('../assets/fonts/SuisseIntl-SemiBold.woff2') format('woff2'),
url('../assets/fonts/SuisseIntl-SemiBold.woff') format('woff');
font-weight: 600;
font-style: normal;
}
@font-face {
font-family: 'Suisse Intl';
src:
url('../assets/fonts/SuisseIntl-Bold.woff2') format('woff2'),
url('../assets/fonts/SuisseIntl-Bold.woff') format('woff');
font-weight: bold;
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');
}

7
packages/next/src/scss/vars.scss
View File

@@ -21,13 +21,6 @@ $baseline: math.div($baseline-px, $baseline-body-size) + rem;
@return (math.div($baseline-px, $baseline-body-size) * $multiplier) + rem; @return (math.div($baseline-px, $baseline-body-size) * $multiplier) + rem;
} }
//////////////////////////////
// FONTS (DEPRECATED. DO NOT USE. PREFER CSS VARIABLES)
//////////////////////////////
$font-body: 'Suisse Intl' !default;
$font-mono: monospace !default;
////////////////////////////// //////////////////////////////
// COLORS (DEPRECATED. DO NOT USE. PREFER CSS VARIABLES) // COLORS (DEPRECATED. DO NOT USE. PREFER CSS VARIABLES)
////////////////////////////// //////////////////////////////

5
packages/richtext-lexical/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';
@@ -20,9 +19,9 @@
--theme-overlay: rgba(5, 5, 5, 0.5); --theme-overlay: rgba(5, 5, 5, 0.5);
--theme-baseline: #{$baseline-px}; --theme-baseline: #{$baseline-px};
--theme-baseline-body-size: #{$baseline-body-size}; --theme-baseline-body-size: #{$baseline-body-size};
--font-body: 'Suisse Intl', system-ui; --font-body: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial,
sans-serif;
--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};

75
packages/richtext-lexical/src/scss/fonts.scss
View File

@@ -1,75 +0,0 @@
@font-face {
font-family: 'Suisse Intl';
src:
url('../assets/fonts/SuisseIntl.woff2') format('woff2'),
url('../assets/fonts/SuisseIntl.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Suisse Intl';
src:
url('../assets/fonts/SuisseIntl-Medium.woff2') format('woff2'),
url('../assets/fonts/SuisseIntl-Medium.woff') format('woff');
font-weight: 500;
font-style: normal;
}
@font-face {
font-family: 'Suisse Intl';
src:
url('../assets/fonts/SuisseIntl-SemiBold.woff2') format('woff2'),
url('../assets/fonts/SuisseIntl-SemiBold.woff') format('woff');
font-weight: 600;
font-style: normal;
}
@font-face {
font-family: 'Suisse Intl';
src:
url('../assets/fonts/SuisseIntl-Bold.woff2') format('woff2'),
url('../assets/fonts/SuisseIntl-Bold.woff') format('woff');
font-weight: bold;
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');
}

7
packages/richtext-lexical/src/scss/vars.scss
View File

@@ -21,13 +21,6 @@ $baseline: math.div($baseline-px, $baseline-body-size) + rem;
@return (math.div($baseline-px, $baseline-body-size) * $multiplier) + rem; @return (math.div($baseline-px, $baseline-body-size) * $multiplier) + rem;
} }
//////////////////////////////
// FONTS (DEPRECATED. DO NOT USE. PREFER CSS VARIABLES)
//////////////////////////////
$font-body: 'Suisse Intl' !default;
$font-mono: monospace !default;
////////////////////////////// //////////////////////////////
// COLORS (DEPRECATED. DO NOT USE. PREFER CSS VARIABLES) // COLORS (DEPRECATED. DO NOT USE. PREFER CSS VARIABLES)
////////////////////////////// //////////////////////////////

5
packages/richtext-slate/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';
@@ -20,9 +19,9 @@
--theme-overlay: rgba(5, 5, 5, 0.5); --theme-overlay: rgba(5, 5, 5, 0.5);
--theme-baseline: #{$baseline-px}; --theme-baseline: #{$baseline-px};
--theme-baseline-body-size: #{$baseline-body-size}; --theme-baseline-body-size: #{$baseline-body-size};
--font-body: 'Suisse Intl', system-ui; --font-body: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial,
sans-serif;
--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};

75
packages/richtext-slate/src/scss/fonts.scss
View File

@@ -1,75 +0,0 @@
@font-face {
font-family: 'Suisse Intl';
src:
url('../assets/fonts/SuisseIntl.woff2') format('woff2'),
url('../assets/fonts/SuisseIntl.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Suisse Intl';
src:
url('../assets/fonts/SuisseIntl-Medium.woff2') format('woff2'),
url('../assets/fonts/SuisseIntl-Medium.woff') format('woff');
font-weight: 500;
font-style: normal;
}
@font-face {
font-family: 'Suisse Intl';
src:
url('../assets/fonts/SuisseIntl-SemiBold.woff2') format('woff2'),
url('../assets/fonts/SuisseIntl-SemiBold.woff') format('woff');
font-weight: 600;
font-style: normal;
}
@font-face {
font-family: 'Suisse Intl';
src:
url('../assets/fonts/SuisseIntl-Bold.woff2') format('woff2'),
url('../assets/fonts/SuisseIntl-Bold.woff') format('woff');
font-weight: bold;
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');
}

7
packages/richtext-slate/src/scss/vars.scss
View File

@@ -21,13 +21,6 @@ $baseline: math.div($baseline-px, $baseline-body-size) + rem;
@return (math.div($baseline-px, $baseline-body-size) * $multiplier) + rem; @return (math.div($baseline-px, $baseline-body-size) * $multiplier) + rem;
} }
//////////////////////////////
// FONTS (DEPRECATED. DO NOT USE. PREFER CSS VARIABLES)
//////////////////////////////
$font-body: 'Suisse Intl' !default;
$font-mono: monospace !default;
////////////////////////////// //////////////////////////////
// COLORS (DEPRECATED. DO NOT USE. PREFER CSS VARIABLES) // COLORS (DEPRECATED. DO NOT USE. PREFER CSS VARIABLES)
////////////////////////////// //////////////////////////////

BIN
packages/ui/src/assets/fonts/SuisseIntl-Bold.woff
View File

Binary file not shown.

BIN
packages/ui/src/assets/fonts/SuisseIntl-Bold.woff2
View File

Binary file not shown.

BIN
packages/ui/src/assets/fonts/SuisseIntl-Medium.woff
View File

Binary file not shown.

BIN
packages/ui/src/assets/fonts/SuisseIntl-Medium.woff2
View File

Binary file not shown.

BIN
packages/ui/src/assets/fonts/SuisseIntl-SemiBold.woff
View File

Binary file not shown.

BIN
packages/ui/src/assets/fonts/SuisseIntl-SemiBold.woff2
View File

Binary file not shown.

BIN
packages/ui/src/assets/fonts/SuisseIntl.woff
View File

Binary file not shown.

BIN
packages/ui/src/assets/fonts/SuisseIntl.woff2
View File

Binary file not shown.

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.

5
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';
@@ -20,9 +19,9 @@
--theme-overlay: rgba(5, 5, 5, 0.5); --theme-overlay: rgba(5, 5, 5, 0.5);
--theme-baseline: #{$baseline-px}; --theme-baseline: #{$baseline-px};
--theme-baseline-body-size: #{$baseline-body-size}; --theme-baseline-body-size: #{$baseline-body-size};
--font-body: 'Suisse Intl', system-ui; --font-body: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial,
sans-serif;
--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};

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

@@ -1,75 +0,0 @@
@font-face {
font-family: 'Suisse Intl';
src:
url('../assets/fonts/SuisseIntl.woff2') format('woff2'),
url('../assets/fonts/SuisseIntl.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Suisse Intl';
src:
url('../assets/fonts/SuisseIntl-Medium.woff2') format('woff2'),
url('../assets/fonts/SuisseIntl-Medium.woff') format('woff');
font-weight: 500;
font-style: normal;
}
@font-face {
font-family: 'Suisse Intl';
src:
url('../assets/fonts/SuisseIntl-SemiBold.woff2') format('woff2'),
url('../assets/fonts/SuisseIntl-SemiBold.woff') format('woff');
font-weight: 600;
font-style: normal;
}
@font-face {
font-family: 'Suisse Intl';
src:
url('../assets/fonts/SuisseIntl-Bold.woff2') format('woff2'),
url('../assets/fonts/SuisseIntl-Bold.woff') format('woff');
font-weight: bold;
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');
}

7
packages/ui/src/scss/vars.scss
View File

@@ -21,13 +21,6 @@ $baseline: math.div($baseline-px, $baseline-body-size) + rem;
@return (math.div($baseline-px, $baseline-body-size) * $multiplier) + rem; @return (math.div($baseline-px, $baseline-body-size) * $multiplier) + rem;
} }
//////////////////////////////
// FONTS (DEPRECATED. DO NOT USE. PREFER CSS VARIABLES)
//////////////////////////////
$font-body: 'Suisse Intl' !default;
$font-mono: monospace !default;
////////////////////////////// //////////////////////////////
// COLORS (DEPRECATED. DO NOT USE. PREFER CSS VARIABLES) // COLORS (DEPRECATED. DO NOT USE. PREFER CSS VARIABLES)
////////////////////////////// //////////////////////////////

4
test/_community/collections/Posts/index.ts
View File

@@ -14,6 +14,10 @@ export const PostsCollection: CollectionConfig = {
name: 'text', name: 'text',
type: 'text', type: 'text',
}, },
{
name: 'richText',
type: 'richText',
},
// { // {
// type: 'row', // type: 'row',
// fields: [], // fields: [],