Optimize font loading

krikienoid · Feb 19, 2023 · 1f6cc83 · 1f6cc83
1 parent 9f39a64
commit 1f6cc83
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/assets/scss/_fonts.scss → src/assets/scss/fonts.scss b/src/assets/scss/_fonts.scss → src/assets/scss/fonts.scss
diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss
@@ -3,8 +3,6 @@
  * @author krikienoid / https://github.com/krikienoid
  */
 
-@use "fonts";
-
 /*! Custom Spectre.css */
 
 @use "vendors/spectre.css/styles";

diff --git a/src/index.html b/src/index.html
@@ -53,10 +53,19 @@
         <!-- BEGIN Web Font Loader -->
         <script type="text/javascript">
             (function () {
+                var PATH_LOCAL_FONT = '@ROOT_URL/assets/css/fonts.css?v=@VERSION';
+
                 var sessionStorage = window.sessionStorage;
 
                 if (sessionStorage && sessionStorage.wfActive) {
-                    document.documentElement.className += ' wf-active';
+                    (function (d) {
+                        var l = d.createElement('link');
+                        l.rel = 'stylesheet';
+                        l.type = 'text/css';
+                        l.href = PATH_LOCAL_FONT;
+                        d.head.appendChild(l);
+                        d.documentElement.className += ' wf-active';
+                    })(document);
 
                     return;
                 }
@@ -65,6 +74,9 @@
                     custom: {
                         families: [
                             'Montserrat:n4,n5,n7'
+                        ],
+                        urls: [
+                            PATH_LOCAL_FONT
                         ]
                     },
                     timeout: 2000,