Merge pull request #780 from primer/swap

shawnbot · web-flow · commit 4f167faf8b23 · 2019-07-17T14:26:17.000-05:00
Prefer FOUT over FOIT with custom @font-face marketing font
diff --git a/src/marketing/support/variables.scss b/src/marketing/support/variables.scss
@@ -6,13 +6,15 @@ $marketing-font-path: "/fonts/" !default;
   font-style: normal;
   font-weight: $font-weight-normal;
   src: local("Inter"), local("Inter-Regular"), url("#{$marketing-font-path}Inter-Regular.woff") format("woff");
+  font-display: swap;
 }
 
 @font-face {
   font-family: Inter;
   font-style: normal;
   font-weight: $font-weight-semibold;
   src: local("Inter Medium"), local("Inter-Medium"), url("#{$marketing-font-path}Inter-Medium.woff") format("woff");
+  font-display: swap;
 }
 
 $font-mktg: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default;

Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,15 @@ $marketing-font-path: "/fonts/" !default;`
`6`	`6`	`font-style: normal;`
`7`	`7`	`font-weight: $font-weight-normal;`
`8`	`8`	`src: local("Inter"), local("Inter-Regular"), url("#{$marketing-font-path}Inter-Regular.woff") format("woff");`
	`9`	`+ font-display: swap;`
`9`	`10`	`}`
`10`	`11`
`11`	`12`	`@font-face {`
`12`	`13`	`font-family: Inter;`
`13`	`14`	`font-style: normal;`
`14`	`15`	`font-weight: $font-weight-semibold;`
`15`	`16`	`src: local("Inter Medium"), local("Inter-Medium"), url("#{$marketing-font-path}Inter-Medium.woff") format("woff");`
	`17`	`+ font-display: swap;`
`16`	`18`	`}`
`17`	`19`
`18`	`20`	`$font-mktg: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default;`