Skip to content

Commit 283bd97

Browse files
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 <actions@github.com>
1 parent cfdec4d commit 283bd97

File tree

3 files changed

+15
-48
lines changed

3 files changed

+15
-48
lines changed

scss/fonts.scss

Lines changed: 13 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -189,70 +189,37 @@
189189
* possible.
190190
*/
191191

192-
@mixin graphik {
193-
font-family: $graphik-fallback;
194-
195-
:global(.fonts-loaded) & {
196-
font-family: $graphik;
197-
}
198-
}
199-
200192
@mixin maison {
201-
font-family: $maison-fallback;
202-
203-
:global(.fonts-loaded) & {
204-
font-family: $maison;
205-
}
193+
font-family: $maison;
206194
}
207195

208196
@mixin maison-extended {
209-
font-family: $maison-fallback;
210-
211-
:global(.fonts-loaded) & {
212-
font-family: $maison-extended;
213-
}
197+
font-family: $maison-extended;
214198
}
215199

216200
@mixin pt-serif {
217-
font-family: $pt-serif-fallback;
218-
219-
:global(.fonts-loaded) & {
220-
font-family: $pt-serif;
221-
}
201+
font-family: $pt-serif;
222202
}
223203

224204
@mixin publico-headline {
225-
font-family: $publico-headline-fallback;
226-
227-
:global(.fonts-loaded) & {
228-
font-family: $publico-headline;
229-
}
205+
font-family: $publico-headline;
230206
}
231207

232208
/*
233-
STOP HERE!
234-
235-
Do not reference the following variables or mixins outside this file!
209+
* STOP HERE!
210+
*
211+
* Do not reference the following variables or mixins outside this file!
212+
*
213+
* Use a mixin to ensure non-system fonts are loaded correctly.
236214
*/
237215

238-
/**
239-
* Do not use these variables directly! Use a mixin to ensure
240-
* non-system fonts are only applied once loaded in order to
241-
* prevent FOIT.
242-
*/
243216
$font-default-sans-fallback: -apple-system, 'Helvetica Neue', Helvetica, 'Hiragino Sans', sans-serif;
244217
$font-default-serif-fallback: Georgia, 'Hiragino Sans', serif;
245218

246-
$maison-fallback: $font-default-sans-fallback;
247-
$graphik-fallback: $font-default-sans-fallback;
248-
$publico-headline-fallback: $font-default-serif-fallback;
249-
$pt-serif-fallback: $font-default-serif-fallback;
250-
251-
$maison: 'MaisonNeue', $maison-fallback;
252-
$maison-extended: 'MaisonNeueExtended', $maison-fallback;
253-
$publico-headline: 'Publico Headline', $publico-headline-fallback;
254-
$pt-serif: 'PTSerif', $pt-serif-fallback;
255-
$graphik: 'Graphik', $graphik-fallback;
219+
$maison: 'MaisonNeue', $font-default-sans-fallback;
220+
$maison-extended: 'MaisonNeueExtended', $font-default-sans-fallback;
221+
$publico-headline: 'Publico Headline', $font-default-serif-fallback;
222+
$pt-serif: 'PTSerif', $font-default-serif-fallback;
256223

257224
/**
258225
* Do not use this mixin directly! This mixin is only to be used the

scss/tokens.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
// Do not edit directly
3-
// Generated on Wed, 14 Oct 2020 13:28:47 GMT
3+
// Generated on Mon, 02 Nov 2020 18:02:01 GMT
44

55
$size-breakpoint-tablet-portrait: 768px;
66
$size-breakpoint-tablet-landscape: 1024px;

swift/QuartzStyles/QuartzStyles.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// QuartzStyles.swift
44
//
55
// Do not edit directly
6-
// Generated on Wed, 14 Oct 2020 13:28:47 GMT
6+
// Generated on Mon, 02 Nov 2020 18:02:01 GMT
77
//
88

99
import UIKit

0 commit comments

Comments
 (0)