From c0588ee76011e3c5d1dbcbfdd8612efb1adca231 Mon Sep 17 00:00:00 2001
From: Firq <firelp42@gmail.com>
Date: Tue, 22 Oct 2024 22:54:02 +0200
Subject: [PATCH] Finding the best font solution

---
 package-lock.json                      |  4 ++--
 package.json                           |  2 +-
 src/components/fgotaHero.astro         |  4 +---
 src/components/titles/smallTitle.astro | 10 +++-------
 src/components/titles/title.astro      |  7 ++-----
 src/layouts/Layout.astro               |  2 ++
 src/pages/404.astro                    |  7 +++----
 7 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fe4f74a..dcc2d34 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "@firq/fgosite",
-	"version": "0.2.0-pre.19",
+	"version": "0.2.0-pre.21",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@firq/fgosite",
-			"version": "0.2.0-pre.19",
+			"version": "0.2.0-pre.21",
 			"dependencies": {
 				"@astro-community/astro-embed-youtube": "^0.5.2",
 				"@astrojs/check": "^0.9.4",
diff --git a/package.json b/package.json
index 0b22c66..2d42f55 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@firq/fgosite",
 	"type": "module",
-	"version": "0.2.0-pre.21",
+	"version": "0.2.0-pre.22",
 	"private": true,
 	"scripts": {
 		"dev": "astro dev",
diff --git a/src/components/fgotaHero.astro b/src/components/fgotaHero.astro
index baebd46..624028b 100644
--- a/src/components/fgotaHero.astro
+++ b/src/components/fgotaHero.astro
@@ -1,6 +1,4 @@
 ---
-import '@fontsource-variable/work-sans';
-
 export interface Props {
   fadeout?: boolean
 }
@@ -35,7 +33,7 @@ const display = fadeout ? "": "display: none"
 
   a {
     font-weight: 500;
-    font-family: 'Work Sans', 'Helvetica Neue', Helvetica, Helvetica, Arial, sans-serif;
+    font-family: 'Work Sans Variable', sans-serif;
     color: white;
     margin: 1rem 0px 0px;
     padding: 0.5rem 0.75rem;
diff --git a/src/components/titles/smallTitle.astro b/src/components/titles/smallTitle.astro
index cc9eb9e..f818269 100644
--- a/src/components/titles/smallTitle.astro
+++ b/src/components/titles/smallTitle.astro
@@ -1,6 +1,4 @@
 ---
-import '@fontsource-variable/work-sans';
-
 export interface Props {
   maintext: string
   subtext: string
@@ -23,7 +21,7 @@ const displayBackButton = returnbutton ? "": "display: none"
 <style>
   a {
     font-weight: 500;
-    font-family: 'Work Sans', 'Helvetica Neue', Helvetica, Helvetica, Arial, sans-serif;
+    font-family: 'Work Sans Variable', sans-serif;
     color: white;
     margin: 1rem 0px 0px;
     padding: 0.5rem 0.75rem;
@@ -64,16 +62,14 @@ const displayBackButton = returnbutton ? "": "display: none"
     padding-top: 2rem;
     font-size: 2rem;
     font-weight: 700;
-    font-family: 'Work Sans', 'Helvetica Neue', Helvetica, Helvetica, Arial,
-      sans-serif;
+    font-family: 'Work Sans Variable', sans-serif;
   }
 
   .sub {
     margin-top: 0.5em;
     font-size: 0.75rem;
     font-weight: 500;
-    font-family: 'Work Sans', 'Helvetica Neue', Helvetica, Helvetica, Arial,
-      sans-serif;
+    font-family: 'Work Sans Variable', sans-serif;
   }
 
   .head {
diff --git a/src/components/titles/title.astro b/src/components/titles/title.astro
index 120fc19..31bd5af 100644
--- a/src/components/titles/title.astro
+++ b/src/components/titles/title.astro
@@ -1,5 +1,4 @@
 ---
-import '@fontsource-variable/work-sans';
 ---
 
 <div class="wrap">
@@ -32,15 +31,13 @@ import '@fontsource-variable/work-sans';
     padding-top: 2rem;
     font-size: 3rem;
     font-weight: 700;
-    font-family: 'Work Sans', 'Helvetica Neue', Helvetica, Helvetica, Arial,
-      sans-serif;
+    font-family: 'Work Sans Variable', sans-serif;
   }
 
   .sub {
     font-size: 1rem;
     font-weight: 500;
-    font-family: 'Work Sans', 'Helvetica Neue', Helvetica, Helvetica, Arial,
-      sans-serif;
+    font-family: 'Work Sans Variable', sans-serif;
   }
 
   .fancy {
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index 5897289..6486407 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -1,4 +1,6 @@
 ---
+import "@fontsource-variable/work-sans";
+
 import Navbar from '../components/navbar/navbar.astro'
 import NavbarEntry from '../components/navbar/navbarEntry.astro'
 import navdata from '../../static/data/_navdata.json'
diff --git a/src/pages/404.astro b/src/pages/404.astro
index dc1c9d7..5435dba 100644
--- a/src/pages/404.astro
+++ b/src/pages/404.astro
@@ -1,5 +1,4 @@
 ---
-import '@fontsource-variable/work-sans';
 import { Image } from 'astro:assets'
 import Layout from '../layouts/Layout.astro'
 import sadshishou from '../assets/shishousad.webp'
@@ -32,7 +31,7 @@ const description = "Error. This shouldn't happen :/"
     align-items: center;
   }
   h2 {
-    font-family: 'Work Sans', 'Helvetica Neue', Helvetica, Helvetica, Arial, sans-serif;
+    font-family: 'Work Sans Variable', sans-serif;
     font-weight: 500;
     color: white;
     font-size: 1.25rem;
@@ -45,8 +44,8 @@ const description = "Error. This shouldn't happen :/"
   a {
     text-align: center;
     width: fit-content;
-    font-weight: 600;
-    font-family: 'Work Sans', 'Helvetica Neue', Helvetica, Helvetica, Arial, sans-serif;
+    font-weight: 500;
+    font-family: 'Work Sans Variable', sans-serif;
     color: white;
     margin: 1rem 0px 0px;
     padding: 0.5rem 0.75rem;