fonts

reednel · Aug 13, 2023 · 76c2eb6 · 76c2eb6
1 parent 084fc75
commit 76c2eb6
Show file tree

Hide file tree

Showing 13 changed files with 60 additions and 19 deletions.
diff --git a/public/fonts/cormorant/cormorant-500.woff2 b/public/fonts/cormorant/cormorant-500.woff2
diff --git a/public/fonts/cormorant/cormorant-700.woff2 b/public/fonts/cormorant/cormorant-700.woff2
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/public/fonts/open-sans/open-sans-400.woff2 b/public/fonts/open-sans/open-sans-400.woff2
diff --git a/public/fonts/open-sans/open-sans-600.woff2 b/public/fonts/open-sans/open-sans-600.woff2
diff --git a/src/config/theme.json b/src/config/theme.json
@@ -31,10 +31,10 @@
   },
   "fonts": {
     "font_family": {
-      "primary": "Calibri:wght@400;600",
+      "primary": "Open Sans:wght@400;600",
       "primary_type": "sans-serif",
-      "secondary": "EB Garamond:wght@500;700",
-      "secondary_type": "sans-serif"
+      "secondary": "Cormorant:wght@500;700",
+      "secondary_type": "serif"
     },
     "font_size": {
       "base": "16",

diff --git a/src/layouts/Base.astro b/src/layouts/Base.astro
@@ -46,19 +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" />
 
+    <!-- fonts -->
     <link
       rel="preload"
-      href="/fonts/eb-garamond/eb-garamond-500.woff2"
+      href="/fonts/open-sans/open-sans-400.woff2"
       as="font"
       type="font/woff2"
-      crossorigin
+      crossorigin="anonymous"
+    />
+    <link
+      rel="preload"
+      href="/fonts/open-sans/open-sans-600.woff2"
+      as="font"
+      type="font/woff2"
+      crossorigin="anonymous"
     />
     <link
       rel="preload"
-      href="/fonts/eb-garamond/eb-garamond-700.woff2"
+      href="/fonts/cormorant/cormorant-500.woff2"
       as="font"
       type="font/woff2"
-      crossorigin
+      crossorigin="anonymous"
+    />
+    <link
+      rel="preload"
+      href="/fonts/cormorant/cormorant-700.woff2"
+      as="font"
+      type="font/woff2"
+      crossorigin="anonymous"
     />
 
     <!-- responsive meta -->

diff --git a/src/layouts/components/Breadcrumbs.astro b/src/layouts/components/Breadcrumbs.astro
@@ -6,7 +6,7 @@ const { className }: { className?: string } = Astro.props;
 const paths = Astro.url.pathname.split("/").filter((x) => x);
 let parts = [
   {
-    label: "home",
+    label: "~",
     href: "/",
     "aria-label": Astro.url.pathname === "/" ? "page" : undefined,
   },

diff --git a/src/layouts/partials/BlogSidebar.astro b/src/layouts/partials/BlogSidebar.astro
@@ -7,7 +7,9 @@ const { tags, categories, allCategories } = Astro.props;
 <div class="lg:col-4">
   <!-- categories -->
   <div class="mb-8">
-    <h5 class="mb-6">Categories</h5>
+    <h4 class="mb-2 text-center">
+      <a href="/blog/categories">Categories</a>
+    </h4>
     <div class="rounded bg-theme-light p-8 dark:bg-darkmode-theme-light">
       <ul class="space-y-4">
         {
@@ -32,7 +34,9 @@ const { tags, categories, allCategories } = Astro.props;
   </div>
   <!-- tags -->
   <div class="mb-8">
-    <h5 class="mb-6">Tags</h5>
+    <h4 class="mb-2 text-center">
+      <a href="/blog/tags">Tags</a>
+    </h4>
     <div class="rounded bg-theme-light p-6 dark:bg-darkmode-theme-light">
       <ul>
         {

diff --git a/src/layouts/partials/DrinkSidebar.astro b/src/layouts/partials/DrinkSidebar.astro
@@ -7,7 +7,9 @@ const { tags, categories, allCategories } = Astro.props;
 <div class="lg:col-4">
   <!-- categories -->
   <div class="mb-8">
-    <h5 class="mb-6">Categories</h5>
+    <h4 class="mb-2 text-center">
+      <a href="/drink/categories">Categories</a>
+    </h4>
     <div class="rounded bg-theme-light p-8 dark:bg-darkmode-theme-light">
       <ul class="space-y-4">
         {
@@ -32,7 +34,9 @@ const { tags, categories, allCategories } = Astro.props;
   </div>
   <!-- tags -->
   <div class="mb-8">
-    <h5 class="mb-6">Tags</h5>
+    <h4 class="mb-2 text-center">
+      <a href="/drink/tags">Tags</a>
+    </h4>
     <div class="rounded bg-theme-light p-6 dark:bg-darkmode-theme-light">
       <ul>
         {

diff --git a/src/styles/base.scss b/src/styles/base.scss
@@ -1,19 +1,37 @@
-/* eb-garamond-500 */
+/* Open Sans 400 */
 @font-face {
   font-display: block; 
-  font-family: 'EB Garamond';
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: url('/fonts/open-sans/open-sans-400.woff2') format('woff2');
+}
+
+/* Open Sans 600 */
+@font-face {
+  font-display: block; 
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  src: url('/fonts/open-sans/open-sans-600.woff2') format('woff2');
+}
+
+/* Cormorant 500 */
+@font-face {
+  font-display: block; 
+  font-family: 'Cormorant';
   font-style: normal;
   font-weight: 500;
-  src: url('/fonts/eb-garamond/eb-garamond-700.woff2') format('woff2');
+  src: url('/fonts/cormorant/cormorant-500.woff2') format('woff2');
 }
 
-/* eb-garamond-700 */
+/* Cormorant 700 */
 @font-face {
   font-display: block; 
-  font-family: 'EB Garamond';
+  font-family: 'Cormorant';
   font-style: normal;
   font-weight: 700;
-  src: url('/fonts/eb-garamond/eb-garamond-700.woff2') format('woff2');
+  src: url('/fonts/cormorant/cormorant-700.woff2') format('woff2');
 }
 
 html {

diff --git a/src/styles/navigation.scss b/src/styles/navigation.scss
@@ -36,7 +36,7 @@ input#nav-toggle:checked ~ #nav-menu {
 }
 
 .nav-link {
-  @apply block p-3 font-semibold text-dark transition hover:text-primary dark:text-darkmode-dark lg:px-2 lg:py-3;
+  @apply block p-3 font-primary font-semibold text-dark transition hover:text-primary dark:text-darkmode-dark lg:px-2 lg:py-3;
 }
 
 .nav-dropdown {