Skip to content

Commit dd8394f

Browse files
authored
fix: remove BlinkMacSystemFont from default local()s (#501)
1 parent bcb8cef commit dd8394f

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ Nuxt will scan your `@font-face` rules and generate fallback rules with the corr
8888
/* This will be generated. */
8989
@font-face {
9090
font-family: 'Roboto fallback';
91-
src: local('BlinkMacSystemFont'), local('Segoe UI'), local('Roboto'), local('Helvetica Neue'),
92-
local('Arial'), local('Noto Sans');
91+
src: local('Segoe UI'), local('Roboto'), local('Helvetica Neue'), local('Arial'), local('Noto Sans');
9392
ascent-override: 92.7734375%;
9493
descent-override: 24.4140625%;
9594
line-gap-override: 0%;

src/module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export default defineNuxtModule<ModuleOptions>({
5757
defaults: nuxt => ({
5858
inject: true,
5959
inline: nuxt.options.ssr,
60-
fallbacks: ['BlinkMacSystemFont', 'Segoe UI', 'Roboto', 'Helvetica Neue', 'Arial', 'Noto Sans'],
60+
fallbacks: ['Segoe UI', 'Roboto', 'Helvetica Neue', 'Arial', 'Noto Sans'],
6161
fonts: [],
6262
}),
6363
async setup(options, nuxt) {

test/e2e.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ describe('font override inlining', async () => {
1111
const html = await $fetch('/')
1212
expect(html.match(/<style>.*?<\/style>/)).toMatchInlineSnapshot(`
1313
[
14-
"<style>@font-face { font-family: "fallback-a"; src: local("Zapfino"); size-adjust: 100%; ascent-override: 92.7734%; descent-override: 24.4141%; line-gap-override: 0%; } @font-face { font-family: "fallback-b"; src: local("Impact"); size-adjust: 100%; ascent-override: 92.7734%; descent-override: 24.4141%; line-gap-override: 0%; } @font-face { font-family: "fallback-c"; src: local("Georgia"); size-adjust: 99.7809%; ascent-override: 92.9771%; descent-override: 24.4677%; line-gap-override: 0%; } @font-face { font-family: "fallback-poppins"; src: local("Georgia"); size-adjust: 112.1577%; ascent-override: 93.6182%; descent-override: 31.2061%; line-gap-override: 8.916%; } @font-face { font-family: "Poppins variant fallback"; src: local("Noto Sans"); size-adjust: 105.4852%; ascent-override: 99.54%; descent-override: 33.18%; line-gap-override: 9.48%; } @font-face { font-family: "Poppins variant fallback"; src: local("Arial"); size-adjust: 112.1577%; ascent-override: 93.6182%; descent-override: 31.2061%; line-gap-override: 8.916%; } @font-face { font-family: "Poppins variant fallback"; src: local("Helvetica Neue"); size-adjust: 111.1111%; ascent-override: 94.5%; descent-override: 31.5%; line-gap-override: 9%; } @font-face { font-family: "Poppins variant fallback"; src: local("Roboto"); size-adjust: 112.404%; ascent-override: 93.4131%; descent-override: 31.1377%; line-gap-override: 8.8965%; } @font-face { font-family: "Poppins variant fallback"; src: local("Segoe UI"); size-adjust: 112.7753%; ascent-override: 93.1055%; descent-override: 31.0352%; line-gap-override: 8.8672%; } @font-face { font-family: "Poppins variant fallback"; src: local("BlinkMacSystemFont"); size-adjust: 120.0469%; ascent-override: 87.4658%; descent-override: 29.1553%; line-gap-override: 8.3301%; } @font-face { font-family: "Roboto fallback"; src: local("Noto Sans"); size-adjust: 93.8448%; ascent-override: 98.8584%; descent-override: 26.0154%; line-gap-override: 0%; } @font-face { font-family: "Roboto fallback"; src: local("Arial"); size-adjust: 99.7809%; ascent-override: 92.9771%; descent-override: 24.4677%; line-gap-override: 0%; } @font-face { font-family: "Roboto fallback"; src: local("Helvetica Neue"); size-adjust: 98.8498%; ascent-override: 93.8529%; descent-override: 24.6981%; line-gap-override: 0%; } @font-face { font-family: "Roboto fallback"; src: local("Roboto"); size-adjust: 100%; ascent-override: 92.7734%; descent-override: 24.4141%; line-gap-override: 0%; } @font-face { font-family: "Roboto fallback"; src: local("Segoe UI"); size-adjust: 100.3304%; ascent-override: 92.4679%; descent-override: 24.3337%; line-gap-override: 0%; } @font-face { font-family: "Roboto fallback"; src: local("BlinkMacSystemFont"); size-adjust: 106.7995%; ascent-override: 86.8669%; descent-override: 22.8597%; line-gap-override: 0%; } </style>",
14+
"<style>@font-face { font-family: "fallback-a"; src: local("Zapfino"); size-adjust: 100%; ascent-override: 92.7734%; descent-override: 24.4141%; line-gap-override: 0%; } @font-face { font-family: "fallback-b"; src: local("Impact"); size-adjust: 100%; ascent-override: 92.7734%; descent-override: 24.4141%; line-gap-override: 0%; } @font-face { font-family: "fallback-c"; src: local("Georgia"); size-adjust: 99.7809%; ascent-override: 92.9771%; descent-override: 24.4677%; line-gap-override: 0%; } @font-face { font-family: "fallback-poppins"; src: local("Georgia"); size-adjust: 112.1577%; ascent-override: 93.6182%; descent-override: 31.2061%; line-gap-override: 8.916%; } @font-face { font-family: "Poppins variant fallback"; src: local("Noto Sans"); size-adjust: 105.4852%; ascent-override: 99.54%; descent-override: 33.18%; line-gap-override: 9.48%; } @font-face { font-family: "Poppins variant fallback"; src: local("Arial"); size-adjust: 112.1577%; ascent-override: 93.6182%; descent-override: 31.2061%; line-gap-override: 8.916%; } @font-face { font-family: "Poppins variant fallback"; src: local("Helvetica Neue"); size-adjust: 111.1111%; ascent-override: 94.5%; descent-override: 31.5%; line-gap-override: 9%; } @font-face { font-family: "Poppins variant fallback"; src: local("Roboto"); size-adjust: 112.404%; ascent-override: 93.4131%; descent-override: 31.1377%; line-gap-override: 8.8965%; } @font-face { font-family: "Poppins variant fallback"; src: local("Segoe UI"); size-adjust: 112.7753%; ascent-override: 93.1055%; descent-override: 31.0352%; line-gap-override: 8.8672%; } @font-face { font-family: "Roboto fallback"; src: local("Noto Sans"); size-adjust: 93.8448%; ascent-override: 98.8584%; descent-override: 26.0154%; line-gap-override: 0%; } @font-face { font-family: "Roboto fallback"; src: local("Arial"); size-adjust: 99.7809%; ascent-override: 92.9771%; descent-override: 24.4677%; line-gap-override: 0%; } @font-face { font-family: "Roboto fallback"; src: local("Helvetica Neue"); size-adjust: 98.8498%; ascent-override: 93.8529%; descent-override: 24.6981%; line-gap-override: 0%; } @font-face { font-family: "Roboto fallback"; src: local("Roboto"); size-adjust: 100%; ascent-override: 92.7734%; descent-override: 24.4141%; line-gap-override: 0%; } @font-face { font-family: "Roboto fallback"; src: local("Segoe UI"); size-adjust: 100.3304%; ascent-override: 92.4679%; descent-override: 24.3337%; line-gap-override: 0%; } </style>",
1515
]
1616
`)
1717
})

0 commit comments

Comments
 (0)