Merge pull request #1238 from primer/tobiasahlin/move-font-face-out-f…

…rom-vars Move marketing @font-face declarations from vars to type
primer · Mar 11, 2021 · 74c5442 · 74c5442
2 parents 914f4ba + 13c49b6
commit 74c5442
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 26 deletions.
diff --git 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
@@ -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,