Load base css files separating instead of importing them and duplicat…

…ing data transferred
mattsherman · Nov 19, 2024 · 0ef73ad · 0ef73ad
1 parent b2099ed
commit 0ef73ad
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/src/_components/BaseStylesLinks.tsx b/src/_components/BaseStylesLinks.tsx
@@ -0,0 +1,7 @@
+export default (data: Lume.Data, _helpers: Lume.Helpers) => (
+  <>
+    <link rel="stylesheet" href={`/${data.cacheBusterVersion}/reset.css`} />
+    <link rel="stylesheet" href={`/${data.cacheBusterVersion}/fonts.css`} />
+    <link rel="stylesheet" href={`/${data.cacheBusterVersion}/base.css`} />
+  </>
+);
diff --git a/src/_includes/layouts/home-page-layout.tsx b/src/_includes/layouts/home-page-layout.tsx
@@ -3,6 +3,7 @@ export default (data: Lume.Data, _helpers: Lume.Helpers) => (
     <head>
       <meta charset="UTF-8" />
       <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+      <data.comp.BaseStylesLinks />
       <link rel="stylesheet" href={`/${data.cacheBusterVersion}/styles.css`} />
       <link
         rel="alternate"

diff --git a/src/_includes/layouts/layout.tsx b/src/_includes/layouts/layout.tsx
@@ -3,6 +3,7 @@ export default (data: Lume.Data, helpers: Lume.Helpers) => (
     <head>
       <meta charset="UTF-8" />
       <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+      <data.comp.BaseStylesLinks />
       <link rel="stylesheet" href={`/${data.cacheBusterVersion}/styles.css`} />
       <link
         rel="alternate"

diff --git a/src/_includes/layouts/post-layout.tsx b/src/_includes/layouts/post-layout.tsx
@@ -13,6 +13,7 @@ export default (data: Lume.Data, helpers: Lume.Helpers) => {
           rel="stylesheet"
           href={`/${data.cacheBusterVersion}/prism-code-themes/okaidia.css`}
         />
+        <data.comp.BaseStylesLinks />
         <link
           rel="stylesheet"
           href={`/${data.cacheBusterVersion}/styles.css`}

diff --git a/src/_includes/layouts/resume-layout.tsx b/src/_includes/layouts/resume-layout.tsx
@@ -3,6 +3,7 @@ export default (data: Lume.Data, helpers: Lume.Helpers) => (
     <head>
       <meta charset="UTF-8" />
       <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+      <data.comp.BaseStylesLinks />
       <link
         rel="stylesheet"
         href={`/${data.cacheBusterVersion}/resume/styles.css`}

diff --git a/src/resume/styles.css b/src/resume/styles.css
@@ -1,8 +1,3 @@
-/* Variables cannot be used in url(), so hardcode version */
-@import url("/v2/reset.css");
-@import url("/v2/fonts.css");
-@import url("/v3/base.css");
-
 @media print {
   @page {
     size: letter;

diff --git a/src/styles.css b/src/styles.css
@@ -1,8 +1,3 @@
-/* Variables cannot be used in url(), so hardcode version */
-@import url("/v2/reset.css");
-@import url("/v2/fonts.css");
-@import url("/v3/base.css");
-
 body > nav {
   padding: 1rem;