merc google

reednel · Aug 13, 2023 · b71c58f · b71c58f
1 parent 98cd480
commit b71c58f
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 10 deletions.
diff --git a/public/fonts/noto-sans/noto-sans-400.woff2 b/public/fonts/noto-sans/noto-sans-400.woff2
diff --git a/public/fonts/noto-sans/noto-sans-600.woff2 b/public/fonts/noto-sans/noto-sans-600.woff2
diff --git a/public/fonts/noto-serif/noto-serif-500.woff2 b/public/fonts/noto-serif/noto-serif-500.woff2
diff --git a/public/fonts/noto-serif/noto-serif-700.woff2 b/public/fonts/noto-serif/noto-serif-700.woff2
diff --git a/src/config/theme.json b/src/config/theme.json
@@ -31,10 +31,10 @@
   },
   "fonts": {
     "font_family": {
-      "primary": "Heebo:wght@400;600",
+      "primary": "Noto Sans:wght@400;600",
       "primary_type": "sans-serif",
-      "secondary": "Signika:wght@500;700",
-      "secondary_type": "sans-serif"
+      "secondary": "Noto Serif:wght@500;700",
+      "secondary_type": "serif"
     },
     "font_size": {
       "base": "16",

diff --git a/src/layouts/Base.astro b/src/layouts/Base.astro
@@ -46,14 +46,34 @@ const { title, meta_title, description, image, noindex, canonical } =
     <meta name="generator" content={Astro.generator} />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-    <!-- google font css -->
-    <link rel="preconnect" href="https://fonts.googleapis.com" />
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+    <!-- fonts -->
     <link
-      href={`https://fonts.googleapis.com/css2?family=${pf}${
-        sf ? "&family=" + sf : ""
-      }&display=swap`}
-      rel="stylesheet"
+      rel="preload"
+      href="/fonts/noto-sans/noto-sans-400.woff2"
+      as="font"
+      type="font/woff2"
+      crossorigin="anonymous"
+    />
+    <link
+      rel="preload"
+      href="/fonts/noto-sans/noto-sans-600.woff2"
+      as="font"
+      type="font/woff2"
+      crossorigin="anonymous"
+    />
+    <link
+      rel="preload"
+      href="/fonts/noto-serif/noto-serif-500.woff2"
+      as="font"
+      type="font/woff2"
+      crossorigin="anonymous"
+    />
+    <link
+      rel="preload"
+      href="/fonts/noto-serif/noto-serif-700.woff2"
+      as="font"
+      type="font/woff2"
+      crossorigin="anonymous"
     />
 
     <!-- responsive meta -->