Include Academicons webfonts

janheinrichmerker · Mar 3, 2024 · 13a4ec7 · 13a4ec7
1 parent c86bed0
commit 13a4ec7
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 18 deletions.
diff --git a/assets/css/_fonts.scss b/assets/css/_fonts.scss
@@ -0,0 +1,2 @@
+@use "fonts/fontawesome";
+@use "fonts/academicons";
diff --git a/assets/css/fonts/_academicons.scss b/assets/css/fonts/_academicons.scss
@@ -0,0 +1 @@
+@use "../../node_modules/academicons/css/academicons";
diff --git a/assets/css/fonts/_fontawesome.scss b/assets/css/fonts/_fontawesome.scss
@@ -0,0 +1,6 @@
+
+$fa-font-path: "/fonts";
+@import "../node_modules/@fortawesome/fontawesome-free/scss/fontawesome";
+@import "../node_modules/@fortawesome/fontawesome-free/scss/brands";
+@import "../node_modules/@fortawesome/fontawesome-free/scss/solid";
+@import "../node_modules/@fortawesome/fontawesome-free/scss/regular";
diff --git a/assets/css/main.scss b/assets/css/main.scss
@@ -10,19 +10,12 @@ $font-family-head: "Space Mono";
 $font-size: 14pt;
 $font-size-icon: 1em;
 
-@import "functions";
+@use "functions";
+@use "fonts";
+@use "code";
+@use "../node_modules/normalize-scss/sass/normalize";
 
-@import url("https://fonts.googleapis.com/css2?family=#{str-replace($font-family-body, " ", "+")}:ital,wght@0,400;0,700;1,400&family=#{str-replace($font-family-head, " ", "+")}:ital,wght@0,400;0,700;1,400&display=swap");
-
-@import "../node_modules/normalize-scss/sass/normalize";
-
-$fa-font-path: "/webfonts/fontawesome/";
-@import "../node_modules/@fortawesome/fontawesome-free/scss/fontawesome.scss";
-@import "../node_modules/@fortawesome/fontawesome-free/scss/brands.scss";
-@import "../node_modules/@fortawesome/fontawesome-free/scss/solid.scss";
-@import "../node_modules/@fortawesome/fontawesome-free/scss/regular.scss";
-
-@import "code";
+@import url("https://fonts.googleapis.com/css2?family=#{$font-family-body}:ital,wght@0,400;0,700;1,400&family=#{$font-family-head}:ital,wght@0,400;0,700;1,400&display=swap");
 
 body {
     display: flex;

diff --git a/layouts/partials/site/styles.html b/layouts/partials/site/styles.html
@@ -2,11 +2,14 @@
 {{- $style := resources.Get "/css/main.scss" | resources.ToCSS $options -}}
 <link rel="stylesheet" href="{{ $style.Permalink }}">
 
-{{/* Publish Font Awesome web fonts. */}}
-{{- $fontawesomeWebfonts := resources.Match "/node_modules/@fortawesome/fontawesome-free/webfonts/*" -}}
-{{- range $fontawesomeWebfonts -}}
-  {{- $name := .Name | strings.TrimPrefix "/node_modules/@fortawesome/fontawesome-free/webfonts/" | printf "/webfonts/fontawesome/%s" -}}
-  {{- with resources.Copy $name . -}}
-    {{- .Publish -}}
+{{/* Publish fonts. */}}
+{{- $fontsPathPrefixes := collections.Slice "/node_modules/@fortawesome/fontawesome-free/webfonts/" "/node_modules/academicons/fonts/" -}}
+{{- range $fontsPathPrefix := $fontsPathPrefixes -}}
+  {{- $fonts := resources.Match (printf "%s/*" $fontsPathPrefix) -}}
+  {{- range $fonts -}}
+    {{- $name := .Name | strings.TrimPrefix $fontsPathPrefix | printf "/fonts/%s" -}}
+    {{- with resources.Copy $name . -}}
+      {{- .Publish -}}
+    {{- end -}}
   {{- end -}}
 {{- end -}}