Skip to content

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

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

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

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6ccf04b
feat: astro-font - optimize fonts & prevent CLS
Jan 26, 2024
9b4c51a
Update _variables.scss
rishi-raj-jain May 15, 2025
51319c8
Update _variables.scss
rishi-raj-jain May 15, 2025
12016f2
Update _variables.scss
rishi-raj-jain May 15, 2025
8db27f6
Merge branch 'main' into main
rishi-raj-jain May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions assets/scss/astro-ecommerce/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,8 +592,8 @@ $aspect-ratios: (
// Font, line-height, and color for body text, headings, and more.

// stylelint-disable value-keyword-case
$font-family-sans-serif: 'Noto Sans', 'Open Sans' !default;
$font-family-pt-mono: 'PT Mono' !default;
$font-family-sans-serif: var(--font-noto-sans), var(--font-open-sans) !default;
$font-family-pt-mono: var(--font-pt-mono) !default;
$font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default;
// stylelint-enable value-keyword-case
$font-family-base: var(--bs-font-sans-serif) !default;
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/astro-ecommerce/bootstrap/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ $aspect-ratios: (

// scss-docs-start font-variables
// stylelint-disable value-keyword-case
$font-family-sans-serif: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
$font-family-sans-serif: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", var(--font-noto-sans), "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
$font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default;
// stylelint-enable value-keyword-case
$font-family-base: var(--#{$prefix}font-sans-serif) !default;
Expand Down
6 changes: 6 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"@types/react": "^18.0.21",
"@types/react-dom": "^18.0.6",
"astro": "^2.0.1",
"astro-font": "^0.0.77",
"forward-ref": "^1.0.0",
"json-server": "^0.17.0",
"react": "^18.2.0",
Expand Down
35 changes: 32 additions & 3 deletions src/layouts/Layout.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
---
import { AstroFont } from 'astro-font';

export interface Props {
title: string;
}
Expand All @@ -12,9 +14,36 @@ const { title } = Astro.props;
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width" />
<link rel="icon" type="image/svg+xml" href={`${import.meta.env.BASE_URL}favicon.svg`} />
<link
href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700|Noto+Sans:300,400,500,600,700,800|PT+Mono:300,400,500,600,700"
rel="stylesheet"
<AstroFont
config={[
{
src: [],
preload: false,
display: "swap",
name: "Noto Sans",
fallback: "sans-serif",
cssVariable: "font-noto-sans",
googleFontsURL: 'https://fonts.googleapis.com/css?family=Noto+Sans:300,400,500,600,700,800',
},
{
src: [],
preload: false,
display: "swap",
name: "Open Sans",
fallback: "sans-serif",
cssVariable: "font-open-sans",
googleFontsURL: 'https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700',
},
{
src: [],
preload: false,
display: "swap",
name: "PT Mono",
fallback: "sans-serif",
cssVariable: "font-pt-mono",
googleFontsURL: 'https://fonts.googleapis.com/css?family=PT+Mono:300,400,500,600,700',
},
]}
/>
<meta name="generator" content={Astro.generator} />
<title>{title}</title>
Expand Down