Font fixes

- Put fonts styles in _fonts.sass
- Stop overriding $fa-font-path in vendor/fontawesome-free/scss/_variables.scss
- Clean up style.sass imports

3 files changed, 12 insertions, 20 deletions

diff --git a/assets/sass/_fonts.sass b/assets/sass/_fonts.sass
index c9a868d..809fafb 100644
--- a/assets/sass/_fonts.sass
+++ b/assets/sass/_fonts.sass
@@ -1,9 +1,11 @@
+$nunito-font-path: '{{ with resources.Get "fonts/NunitoSans/NunitoSans-Regular.ttf" }}{{.Permalink}}{{ end }}'
+
 /* vietnamese */
 @font-face
   font-family: "Nunito Sans"
   font-style: normal
   font-weight: normal
-  src: local("Nunito Sans Regular"), local("NunitoSans-Regular"), url(#{$nunito-font-path}/NunitoSans-Regular.ttf) format("woff2")
+  src: local("Nunito Sans Regular"), local("NunitoSans-Regular"), url(#{$nunito-font-path}) format("woff2")
   unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB
 
 /* latin-ext */
@@ -11,7 +13,7 @@
   font-family: "Nunito Sans"
   font-style: normal
   font-weight: normal
-  src: local("Nunito Sans Regular"), local("NunitoSans-Regular"), url(#{$nunito-font-path}/NunitoSans-Regular.ttf) format("woff2")
+  src: local("Nunito Sans Regular"), local("NunitoSans-Regular"), url(#{$nunito-font-path}) format("woff2")
   unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF
 
 /* latin */
@@ -19,5 +21,7 @@
   font-family: "Nunito Sans"
   font-style: normal
   font-weight: normal
-  src: local("Nunito Sans Regular"), local("NunitoSans-Regular"), url(#{$nunito-font-path}/NunitoSans-Regular.ttf) format("woff2")
+  src: local("Nunito Sans Regular"), local("NunitoSans-Regular"), url(#{$nunito-font-path}) format("woff2")
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD
+
+@import "fontawesome-import"
diff --git a/assets/sass/style.sass b/assets/sass/style.sass
index 220a4af..05bf4c5 100644
--- a/assets/sass/style.sass
+++ b/assets/sass/style.sass
@@ -1,31 +1,19 @@
 {{ $themeStyle := .Site.Params.themeStyle | default "light" }}
-$fa-font-path:     '{{ urls.Parse "/fonts/fontawesome-free/webfonts" }}'
-$nunito-font-path: '{{ urls.Parse "/fonts/NunitoSans" }}'
 
 {{ if eq $themeStyle "auto" }}
-@import "fonts"
 @import "light-variables"
-@import "base-variables"
-@import "bulma-import"
-@import "fontawesome-import"
-@import "base"
 @import "light-style"
 
 @media (prefers-color-scheme: dark)
-    @import "fonts"
     @import "dark-variables"
-    @import "base-variables"
-    @import "bulma-import"
-    @import "fontawesome-import"
-    @import "base"
     @import "dark-style"
 
 {{ else }}
-@import "fonts"
 @import "{{ $themeStyle }}-variables"
+@import "{{ $themeStyle }}-style"
+{{ end }}
+
+@import "fonts"
 @import "base-variables"
 @import "bulma-import"
-@import "fontawesome-import"
 @import "base"
-@import "{{ $themeStyle }}-style"
-{{ end }}
diff --git a/assets/vendor/fontawesome-free/scss/_variables.scss b/assets/vendor/fontawesome-free/scss/_variables.scss
index cf5c417..af4b5f8 100644
--- a/assets/vendor/fontawesome-free/scss/_variables.scss
+++ b/assets/vendor/fontawesome-free/scss/_variables.scss
@@ -1,7 +1,7 @@
 // Variables
 // --------------------------
 
-$fa-font-path:                "../webfonts" !default;
+$fa-font-path:                "/fonts/fontawesome-free/webfonts/" !default;
 $fa-font-size-base:           16px !default;
 $fa-css-prefix:               fa !default;
 $fa-version:                  "5.2.0" !default;