Move down a directory so it works both locally and in a deploy

Keavon · Keavon · commit b89a22cbfb67 · 2025-05-19T00:45:28.000-07:00
diff --git a/website/.gitignore b/website/.gitignore
@@ -1,4 +1,5 @@
 node_modules/
 public/
-static/fonts/
+static/files/
+static/fonts.css
 static/syntax-highlighting.css
diff --git a/website/install-fonts.js b/website/install-fonts.js
@@ -7,17 +7,17 @@ const basePath = path.resolve(__dirname);
 // Define files to copy as [source, destination] pairs
 // Files with the same destination will be concatenated
 const FILES_TO_COPY = [
-	["node_modules/@fontsource-variable/inter/index.css", "static/fonts/common.css"],
-	["node_modules/@fontsource-variable/inter/wght-italic.css", "static/fonts/common.css"],
-	["node_modules/@fontsource/bona-nova/700.css", "static/fonts/common.css"],
-	// ["node_modules/@fontsource/noto-color-emoji/index.css", "static/fonts/noto-color-emoji.css"],
+	["node_modules/@fontsource-variable/inter/index.css", "static/fonts.css"],
+	["node_modules/@fontsource-variable/inter/wght-italic.css", "static/fonts.css"],
+	["node_modules/@fontsource/bona-nova/700.css", "static/fonts.css"],
+	// ["node_modules/@fontsource/noto-color-emoji/index.css", "static/noto-color-emoji.css"],
 ];
 
 // Define directories to copy recursively as [source, destination] pairs
 const DIRECTORIES_TO_COPY = [
-	["node_modules/@fontsource-variable/inter/files", "static/fonts/files"],
-	["node_modules/@fontsource/bona-nova/files", "static/fonts/files"],
-	// ["node_modules/@fontsource/noto-color-emoji/files", "static/fonts/files"],
+	["node_modules/@fontsource-variable/inter/files", "static/files"],
+	["node_modules/@fontsource/bona-nova/files", "static/files"],
+	// ["node_modules/@fontsource/noto-color-emoji/files", "static/files"],
 ];
 
 // Track processed destination files and CSS content
diff --git a/website/other/bezier-rs-demos/index.html b/website/other/bezier-rs-demos/index.html
@@ -4,7 +4,7 @@
 		<meta charset="utf-8" />
 		<title>Bezier-rs Interactive Documentation</title>
 		<link rel="stylesheet" href="./style.css" />
-		<link href="https://graphite.rs/fonts/common.css" rel="stylesheet" />
+		<link href="https://graphite.rs/fonts.css" rel="stylesheet" />
 	</head>
 	<body>
 		<noscript>JavaScript is required</noscript>
diff --git a/website/templates/base.html b/website/templates/base.html
@@ -35,8 +35,8 @@
 	{%- set global_linked_js = [] -%}
 	{%- set global_linked_css = [] -%}
 	{%- set global_js = ["/js/text-justification.js", "/js/navbar.js"] -%}
-	{%- set global_css = ["/base.css", "/fonts/common.css"] -%}
-	{%- set fonts_loaded = load_data(path="static/fonts/common.css", format="plain", required=false) -%}
+	{%- set global_css = ["/base.css", "/fonts.css"] -%}
+	{%- set fonts_loaded = load_data(path="static/fonts.css", format="plain", required=false) -%}
 	{%- if not fonts_loaded -%}
 	{{ throw(message="------------------------------------------------------------> FONTS ARE NOT INSTALLED! Before running Zola, execute `npm run install-fonts` from the `/website` directory.") }}
 	{%- endif -%}
