Remove fonts-loaded (#32)

* Remove fonts-loaded wrapper * Not ready to get rid of plain mixins. * Add built client styles Co-authored-by: GitHub Actions <[email protected]>
Quartz · Nov 2, 2020 · 283bd97 · 283bd97
1 parent cfdec4d
commit 283bd97
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 48 deletions.
diff --git a/scss/fonts.scss b/scss/fonts.scss
@@ -189,70 +189,37 @@
  * possible.
  */
 
-@mixin graphik {
-	font-family: $graphik-fallback;
-
-	:global(.fonts-loaded) & {
-		font-family: $graphik;
-	}
-}
-
 @mixin maison {
-	font-family: $maison-fallback;
-
-	:global(.fonts-loaded) & {
-		font-family: $maison;
-	}
+	font-family: $maison;
 }
 
 @mixin maison-extended {
-	font-family: $maison-fallback;
-
-	:global(.fonts-loaded) & {
-		font-family: $maison-extended;
-	}
+	font-family: $maison-extended;
 }
 
 @mixin pt-serif {
-	font-family: $pt-serif-fallback;
-
-	:global(.fonts-loaded) & {
-		font-family: $pt-serif;
-	}
+	font-family: $pt-serif;
 }
 
 @mixin publico-headline {
-	font-family: $publico-headline-fallback;
-
-	:global(.fonts-loaded) & {
-		font-family: $publico-headline;
-	}
+	font-family: $publico-headline;
 }
 
 /*
-	STOP HERE!
-
- 	Do not reference the following variables or mixins outside this file!
+ * STOP HERE!
+ *
+ * Do not reference the following variables or mixins outside this file!
+ *
+ * Use a mixin to ensure non-system fonts are loaded correctly.
 */
 
-/**
- * Do not use these variables directly! Use a mixin to ensure
- * non-system fonts are only applied once loaded in order to
- * prevent FOIT.
- */
 $font-default-sans-fallback: -apple-system, 'Helvetica Neue', Helvetica, 'Hiragino Sans', sans-serif;
 $font-default-serif-fallback: Georgia, 'Hiragino Sans', serif;
 
-$maison-fallback: $font-default-sans-fallback;
-$graphik-fallback: $font-default-sans-fallback;
-$publico-headline-fallback: $font-default-serif-fallback;
-$pt-serif-fallback: $font-default-serif-fallback;
-
-$maison: 'MaisonNeue', $maison-fallback;
-$maison-extended: 'MaisonNeueExtended', $maison-fallback;
-$publico-headline: 'Publico Headline', $publico-headline-fallback;
-$pt-serif: 'PTSerif', $pt-serif-fallback;
-$graphik: 'Graphik', $graphik-fallback;
+$maison: 'MaisonNeue', $font-default-sans-fallback;
+$maison-extended: 'MaisonNeueExtended', $font-default-sans-fallback;
+$publico-headline: 'Publico Headline', $font-default-serif-fallback;
+$pt-serif: 'PTSerif', $font-default-serif-fallback;
 
 /**
  * Do not use this mixin directly! This mixin is only to be used the

diff --git a/scss/tokens.scss b/scss/tokens.scss
@@ -1,6 +1,6 @@
 
 // Do not edit directly
-// Generated on Wed, 14 Oct 2020 13:28:47 GMT
+// Generated on Mon, 02 Nov 2020 18:02:01 GMT
 
 $size-breakpoint-tablet-portrait: 768px;
 $size-breakpoint-tablet-landscape: 1024px;

diff --git a/swift/QuartzStyles/QuartzStyles.swift b/swift/QuartzStyles/QuartzStyles.swift
@@ -3,7 +3,7 @@
 // QuartzStyles.swift
 //
 // Do not edit directly
-// Generated on Wed, 14 Oct 2020 13:28:47 GMT
+// Generated on Mon, 02 Nov 2020 18:02:01 GMT
 //
 
 import UIKit