Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: astro-font - optimize fonts & prevent CLS #91

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat: astro-font - optimize fonts & prevent CLS #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2545c1b
feat: astro-font - optimize fonts & prevent CLS
Jan 13, 2024
58f0e2d
Update DefaultLayout.astro
Jan 13, 2024
98966bd
Update DefaultLayout.astro
Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Expand Up @@ -21,6 +21,7 @@
"accessible-astro-components": "^2.3.5",
"astro": "^4.0.7",
"astro-compress": "^2.0.6",
"astro-font": "^0.0.72",
"astro-icon": "^1.0.2",
"eslint": "^8.33.0",
"eslint-plugin-astro": "^0.23.0",
Expand Down
36 changes: 0 additions & 36 deletions src/assets/scss/base/_font.scss
View file
Open in desktop
Expand Up @@ -4,42 +4,6 @@

@use 'breakpoint' as *;

@font-face {
font-family: 'Open Sans';
src: local('Open Sans ExtraBold'), local('OpenSans-ExtraBold'), url('/fonts/OpenSans-ExtraBold.woff2') format('woff2'),
url('/fonts/OpenSans-ExtraBold.woff') format('woff');
font-weight: bold;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: 'Open Sans';
src: local('Open Sans Bold'), local('OpenSans-Bold'), url('/fonts/OpenSans-Bold.woff2') format('woff2'),
url('/fonts/OpenSans-Bold.woff') format('woff');
font-weight: bold;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: 'Open Sans';
src: local('Open Sans Italic'), local('OpenSans-Italic'), url('/fonts/OpenSans-Italic.woff2') format('woff2'),
url('/fonts/OpenSans-Italic.woff') format('woff');
font-weight: normal;
font-style: italic;
font-display: swap;
}

@font-face {
font-family: 'Open Sans';
src: local('Open Sans Regular'), local('OpenSans-Regular'), url('/fonts/OpenSans-Regular.woff2') format('woff2'),
url('/fonts/OpenSans-Regular.woff') format('woff');
font-weight: normal;
font-style: normal;
font-display: swap;
}

body {
font-family: var(--font-family-default);
text-shadow: rgba(0, 0, 0, 0.01) 0 0 1px;
Expand Down
51 changes: 48 additions & 3 deletions src/layouts/DefaultLayout.astro
View file
Open in desktop
@@ -1,4 +1,6 @@
---
import { join } from 'node:path'
import { AstroFont } from 'astro-font'
import '@astrojs/tailwind/base.css'
import '../assets/scss/globals.scss'
import SiteMeta from '../components/SiteMeta.astro'
Expand All @@ -12,14 +14,59 @@ const {
image = '/social-preview-image.png',
author = 'Mark Teekman',
} = Astro.props

const makeFontPath = (name: string) => join(process.cwd(), 'public', 'fonts', name)

const fontSources = [
{
style: 'bold',
weight: '900',
path: makeFontPath('OpenSans-ExtraBold.woff2')
},
{
preload: true,
style: 'bold',
weight: '800',
path: makeFontPath('OpenSans-Bold.woff2')
},
{
style: 'italic',
weight: '400',
path: makeFontPath('OpenSans-Italic.woff2')
},
{
style: 'normal',
weight: '400',
path: makeFontPath('OpenSans-Regular.woff2')
},
]
---

<html lang="en" dir="ltr">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="X-UA-Compatible" content="ie=edge" />

<AstroFont
config={[
{
name: "Open Sans",
src: fontSources,
preload: false,
display: "swap",
fallback: "sans-serif",
cssVariable: "font-family-default",
},
{
name: "Open Sans",
src: fontSources,
preload: false,
display: "swap",
fallback: "sans-serif",
cssVariable: "font-family-special",
},
]}
/>
<!-- favicon -->
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />

Expand All @@ -46,8 +93,6 @@ const {
--radius-large: 6px;
--gap-default: 2rem;
--font-measure: 70ch;
--font-family-default: 'Open Sans', sans-serif;
--font-family-special: 'Open Sans', sans-serif;
// light theme
--font-color: var(--neutral-900);
--action-color: var(--primary-300);
Expand Down