Skip to content

Commit 25af7fa

Browse files
committed
Update fontsource integration according with the documentation
1 parent 9827547 commit 25af7fa

File tree

3 files changed

+21
-7
lines changed

3 files changed

+21
-7
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
},
1717
"license": "GPL-2.0",
1818
"dependencies": {
19+
"@fontsource-utils/scss": "^0.2.2",
1920
"@fontsource/poppins": "^5.0.5",
2021
"lazysizes": "^5.3.2",
2122
"oneloop.js": "^5.2.1"

src/scss/03-base/_fonts.scss

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
*
77
* Examples :
88
*
9-
* 1 - Install the font by the command :
9+
* 1 - Install the font and the utilities by the command :
10+
* yarn add @fontsource-utils/scss
11+
*
1012
* // For Classic font
1113
* yarn add @fontsource/myFont
1214
*
@@ -15,20 +17,23 @@
1517
*
1618
* 2 - Declare font-face :
1719
* // For Classic font
18-
* @use "~@fontsource/myFont/scss/mixins" as MyFont;
19-
* @include MyFont.faces($weights: (400, 700));
20+
* @use "../../../node_modules/@fontsource-utils/scss/src/mixins" as fontsource;
21+
* @use "../../../node_modules/@fontsource/myFont/scss/mixins" as MyFont;
22+
* @include fontsource.faces($metadata: MyFont.$metadata, $weights: (400, 700));
2023
* ...
2124
*
2225
* // For Variable font
23-
* @use "~@fontsource-variable/myFont/scss/mixins" as MyFont;
24-
* @include MyFont.faces($axes: all);
26+
* @use "../../../node_modules/@fontsource-utils/scss/src/mixins" as fontsource;
27+
* @use "../../../node_modules/@fontsource-variable/myFont/scss/mixins" as MyFont;
28+
* @include fontsource.faces($metadata: MyFont.$metadata, $axes: wght);
2529
* ...
2630
*/
2731

32+
@use "../../../node_modules/@fontsource-utils/scss/src/mixins" as fontsource;
2833
@use "../../../node_modules/@fontsource/poppins/scss/mixins" as Poppins;
2934

30-
@include Poppins.faces($weights: (300, 400, 500, 700), $styles: normal);
31-
@include Poppins.faces($weights: (300, 400, 500, 700), $styles: italic);
35+
@include fontsource.faces($metadata: Poppins.$metadata, $weights: (300, 400, 500, 700), $styles: normal);
36+
@include fontsource.faces($metadata: Poppins.$metadata, $weights: (300, 400, 500, 700), $styles: italic);
3237

3338
// Fallbacks for DM Sans to improve cls
3439
// https://deploy-preview-15--upbeat-shirley-608546.netlify.app/perfect-ish-font-fallback/?font=Poppins

yarn.lock

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -628,6 +628,13 @@ __metadata:
628628
languageName: node
629629
linkType: hard
630630

631+
"@fontsource-utils/scss@npm:^0.2.2":
632+
version: 0.2.2
633+
resolution: "@fontsource-utils/scss@npm:0.2.2"
634+
checksum: 10/d4092b7564a82806d83e6f2d9a3b5e2b7ee187e52d57a24ae26fe2d074ab4aea205ed729ce2f2ffa3ecd4dfae1089e4003b7ae4e92162c0ac6fa1ff9ad5e0adf
635+
languageName: node
636+
linkType: hard
637+
631638
"@fontsource/poppins@npm:^5.0.5":
632639
version: 5.2.5
633640
resolution: "@fontsource/poppins@npm:5.2.5"
@@ -2250,6 +2257,7 @@ __metadata:
22502257
version: 0.0.0-use.local
22512258
resolution: "beapi-frontend-framework@workspace:."
22522259
dependencies:
2260+
"@fontsource-utils/scss": "npm:^0.2.2"
22532261
"@fontsource/poppins": "npm:^5.0.5"
22542262
"@wordpress/blocks": "npm:^11.16.0"
22552263
"@wordpress/browserslist-config": "npm:^6.21.0"

0 commit comments

Comments
 (0)