From 13c49b6c524a77f21cd51c053c42115e213ce39c Mon Sep 17 00:00:00 2001 From: Tobias Ahlin Date: Tue, 9 Mar 2021 14:00:38 +0100 Subject: [PATCH] Move @font-face declarations from vars to type --- src/marketing/support/variables.scss | 25 ------------------------- src/marketing/type/typography.scss | 26 +++++++++++++++++++++++++- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/src/marketing/support/variables.scss b/src/marketing/support/variables.scss index 7d0ec1ca07..dc05570a0d 100644 --- a/src/marketing/support/variables.scss +++ b/src/marketing/support/variables.scss @@ -1,30 +1,5 @@ $marketing-font-path: "/fonts/" !default; -// Type -@font-face { - font-family: Inter; - 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-face { - font-family: Inter; - font-style: normal; - font-weight: $font-weight-bold; - src: local("Inter Bold"), local("Inter-Bold"), url("#{$marketing-font-path}Inter-Bold.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; // Builds upon @primer/css/support/variables/typography.scss diff --git a/src/marketing/type/typography.scss b/src/marketing/type/typography.scss index 63667fdc05..54914a0640 100644 --- a/src/marketing/type/typography.scss +++ b/src/marketing/type/typography.scss @@ -1,5 +1,29 @@ -// Headings +// Type +@font-face { + font-family: Inter; + 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-face { + font-family: Inter; + font-style: normal; + font-weight: $font-weight-bold; + src: local("Inter Bold"), local("Inter-Bold"), url("#{$marketing-font-path}Inter-Bold.woff") format("woff"); + font-display: swap; +} + +// Headings .h000-mktg, .h00-mktg, .h0-mktg,