Skip to content

Commit 9a7b6c7

Browse files
committed
chore: use scss @use instead of @import
1 parent 046a9da commit 9a7b6c7

File tree

5 files changed

+36
-41
lines changed

5 files changed

+36
-41
lines changed

next.config.mjs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ let nextConfig = {
3737
basePath: process.env.NEXT_PUBLIC_BASE_PATH || undefined,
3838
transpilePackages: MONOREPO_MODE ? ["@squonk/mui-theme", "@squonk/sdf-parser"] : [],
3939
sassOptions: {
40-
prependData: `$assetsURL: '${
41-
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
42-
process.env.ASSET_URL || "https://squonk.informaticsmatters.org"
43-
}';`,
40+
prependData: `$assetsURL: '${process.env.ASSET_URL}';`,
4441
},
4542
images: {
4643
domains: ["squonk.informaticsmatters.org"],

src/styles/fonts/open-sans.scss

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/styles/fonts/raleway.scss

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/styles/globalStyles.scss

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,34 @@
1-
// Should use @use instead but need these sheets to access $assetUrl in the global scope
2-
@import "fonts/open-sans";
3-
@import "fonts/raleway";
1+
@use "mixins/font-face-template" with ($base_url: $assetsURL);
2+
3+
@include font-face-template.font-face-template("Open Sans", "OpenSans-Light", normal, 300);
4+
@include font-face-template.font-face-template("Open Sans", "OpenSans-LightItalic", italic, 300);
5+
@include font-face-template.font-face-template("Open Sans", "OpenSans-Regular", normal, 400);
6+
@include font-face-template.font-face-template("Open Sans", "OpenSans-Italic", italic, 400);
7+
@include font-face-template.font-face-template("Open Sans", "OpenSans-SemiBold", normal, 600);
8+
@include font-face-template.font-face-template("Open Sans", "OpenSans-SemiBoldItalic", italic, 600);
9+
@include font-face-template.font-face-template("Open Sans", "OpenSans-Bold", normal, 700);
10+
@include font-face-template.font-face-template("Open Sans", "OpenSans-BoldItalic", italic, 700);
11+
@include font-face-template.font-face-template("Open Sans", "OpenSans-ExtraBold", normal, 800);
12+
@include font-face-template.font-face-template("Open Sans", "OpenSans-ExtraBoldItalic", italic, 800);
13+
14+
@include font-face-template.font-face-template("Raleway", "Raleway-Thin", normal, 100);
15+
@include font-face-template.font-face-template("Raleway", "Raleway-ThinItalic", italic, 100);
16+
@include font-face-template.font-face-template("Raleway", "Raleway-ExtraLight", normal, 200);
17+
@include font-face-template.font-face-template("Raleway", "Raleway-ExtraLightItalic", italic, 200);
18+
@include font-face-template.font-face-template("Raleway", "Raleway-Light", normal, 300);
19+
@include font-face-template.font-face-template("Raleway", "Raleway-LightItalic", italic, 300);
20+
@include font-face-template.font-face-template("Raleway", "Raleway-Regular", normal, normal);
21+
@include font-face-template.font-face-template("Raleway", "Raleway-Italic", italic, normal);
22+
@include font-face-template.font-face-template("Raleway", "Raleway-Medium", normal, 500);
23+
@include font-face-template.font-face-template("Raleway", "Raleway-MediumItalic", italic, 500);
24+
@include font-face-template.font-face-template("Raleway", "Raleway-SemiBold", normal, 600);
25+
@include font-face-template.font-face-template("Raleway", "Raleway-SemiBoldItalic", italic, 600);
26+
@include font-face-template.font-face-template("Raleway", "Raleway-BoldItalic", italic, bold);
27+
@include font-face-template.font-face-template("Raleway", "Raleway-Bold", normal, bold);
28+
@include font-face-template.font-face-template("Raleway", "Raleway-ExtraBold", normal, 800);
29+
@include font-face-template.font-face-template("Raleway", "Raleway-ExtraBoldItalic", italic, 800);
30+
@include font-face-template.font-face-template("Raleway", "Raleway-Black", normal, 900);
31+
@include font-face-template.font-face-template("Raleway", "Raleway-BlackItalic", italic, 900);
432

533
@import url("https://fonts.googleapis.com/css2?family=Fira+Mono&display=swap");
634

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
$base_url: "https://squonk.informaticsmatters.org" !default;
2+
13
@mixin font-face-template($font-family, $file-name, $style, $weight) {
24
@font-face {
35
font-family: $font-family;
@@ -6,8 +8,8 @@
68
font-display: swap;
79
src:
810
local($font-family),
9-
url($assetsURL + "/assets/fonts/#{$file-name}.woff2") format("woff2"),
10-
/* Chrome 26+, Opera 23+, Firefox 39+ */ url($assetsURL + "/assets/fonts/#{$file-name}.woff")
11+
url($base_url + "/assets/fonts/#{$file-name}.woff2") format("woff2"),
12+
/* Chrome 26+, Opera 23+, Firefox 39+ */ url($base_url + "/assets/fonts/#{$file-name}.woff")
1113
format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
1214
}
1315
}

0 commit comments

Comments
 (0)