Merge pull request #16 from reednel/develop

test font hosting
reednel · Aug 13, 2023 · 4ce2897 · 4ce2897
2 parents 1951967 + f513e8f
commit 4ce2897
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/public/fonts/eb-garamond/eb-garamond-500.woff2 b/public/fonts/eb-garamond/eb-garamond-500.woff2
diff --git a/public/fonts/eb-garamond/eb-garamond-700.woff2 b/public/fonts/eb-garamond/eb-garamond-700.woff2
diff --git a/src/config/theme.json b/src/config/theme.json
@@ -33,7 +33,7 @@
     "font_family": {
       "primary": "Calibri:wght@400;600",
       "primary_type": "sans-serif",
-      "secondary": "Garamond:wght@500;700",
+      "secondary": "EB Garamond:wght@500;700",
       "secondary_type": "sans-serif"
     },
     "font_size": {

diff --git a/src/layouts/Base.astro b/src/layouts/Base.astro
@@ -46,14 +46,19 @@ 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 />
     <link
-      href={`https://fonts.googleapis.com/css2?family=${pf}${
-        sf ? "&family=" + sf : ""
-      }&display=swap`}
-      rel="stylesheet"
+      rel="preload"
+      href="/fonts/eb-garamond/eb-garamond-500.woff2"
+      as="font"
+      type="font/woff2"
+      crossorigin
+    />
+    <link
+      rel="preload"
+      href="/fonts/eb-garamond/eb-garamond-700.woff2"
+      as="font"
+      type="font/woff2"
+      crossorigin
     />
 
     <!-- responsive meta -->

diff --git a/src/styles/base.scss b/src/styles/base.scss
@@ -1,3 +1,21 @@
+/* eb-garamond-500 */
+@font-face {
+  font-display: block; 
+  font-family: 'EB Garamond';
+  font-style: normal;
+  font-weight: 500;
+  src: url('/fonts/eb-garamond/eb-garamond-700.woff2') format('woff2');
+}
+
+/* eb-garamond-700 */
+@font-face {
+  font-display: block; 
+  font-family: 'EB Garamond';
+  font-style: normal;
+  font-weight: 700;
+  src: url('/fonts/eb-garamond/eb-garamond-700.woff2') format('woff2');
+}
+
 html {
   @apply text-base h-screen;
 }