From 4cc01ef77d2737c3877ff5ed0058afab96e4b1d7 Mon Sep 17 00:00:00 2001
From: Helen Chong <119173961+helenclx@users.noreply.github.com>
Date: Tue, 12 Nov 2024 11:58:16 +0800
Subject: [PATCH] Move favicon folder to main assets folder

---
 src/_config/files.js                                |   2 +-
 src/_includes/global/base.njk                       |   6 +++---
 src/assets/{graphics => }/favicon/HC-favicon.svg    |   0
 .../favicon/android-chrome-192x192.png              | Bin
 .../favicon/android-chrome-512x512.png              | Bin
 .../{graphics => }/favicon/apple-touch-icon.png     | Bin
 src/assets/{graphics => }/favicon/favicon.ico       | Bin
 src/assets/{graphics => }/favicon/icon-mask.png     | Bin
 src/assets/{graphics => }/favicon/site.webmanifest  |   0
 9 files changed, 4 insertions(+), 4 deletions(-)
 rename src/assets/{graphics => }/favicon/HC-favicon.svg (100%)
 rename src/assets/{graphics => }/favicon/android-chrome-192x192.png (100%)
 rename src/assets/{graphics => }/favicon/android-chrome-512x512.png (100%)
 rename src/assets/{graphics => }/favicon/apple-touch-icon.png (100%)
 rename src/assets/{graphics => }/favicon/favicon.ico (100%)
 rename src/assets/{graphics => }/favicon/icon-mask.png (100%)
 rename src/assets/{graphics => }/favicon/site.webmanifest (100%)

diff --git a/src/_config/files.js b/src/_config/files.js
index 5a28d493..90b431b2 100644
--- a/src/_config/files.js
+++ b/src/_config/files.js
@@ -3,7 +3,7 @@ export default function(eleventyConfig) {
     eleventyConfig.addPassthroughCopy("./src/assets/");
     eleventyConfig.addWatchTarget("./src/assets/");
     eleventyConfig.addPassthroughCopy({
-        "./src/assets/graphics/favicon/favicon.ico": "/favicon.ico",
+        "./src/assets/favicon/favicon.ico": "/favicon.ico",
         "node_modules/@zachleat/details-utils/details-utils.js": "assets/js/details-utils.js",
     });
 }
\ No newline at end of file
diff --git a/src/_includes/global/base.njk b/src/_includes/global/base.njk
index 330b978f..7ac16d9f 100644
--- a/src/_includes/global/base.njk
+++ b/src/_includes/global/base.njk
@@ -23,9 +23,9 @@
 
         {# Favicon #}
         <link rel="icon" sizes="32x32" href="/favicon.ico">
-        <link rel="icon" type="image/svg+xml" href="/assets/graphics/favicon/HC-favicon.svg">
-        <link rel="apple-touch-icon" sizes="180x180" href="/assets/graphics/favicon/apple-touch-icon.png">
-        <link rel="manifest" href="/assets/graphics/favicon/site.webmanifest">
+        <link rel="icon" type="image/svg+xml" href="/assets/favicon/HC-favicon.svg">
+        <link rel="apple-touch-icon" sizes="180x180" href="/assets/favicon/apple-touch-icon.png">
+        <link rel="manifest" href="/assets/favicon/site.webmanifest">
 
         {# CSS #}
         {% include "global/css.njk" %}
diff --git a/src/assets/graphics/favicon/HC-favicon.svg b/src/assets/favicon/HC-favicon.svg
similarity index 100%
rename from src/assets/graphics/favicon/HC-favicon.svg
rename to src/assets/favicon/HC-favicon.svg
diff --git a/src/assets/graphics/favicon/android-chrome-192x192.png b/src/assets/favicon/android-chrome-192x192.png
similarity index 100%
rename from src/assets/graphics/favicon/android-chrome-192x192.png
rename to src/assets/favicon/android-chrome-192x192.png
diff --git a/src/assets/graphics/favicon/android-chrome-512x512.png b/src/assets/favicon/android-chrome-512x512.png
similarity index 100%
rename from src/assets/graphics/favicon/android-chrome-512x512.png
rename to src/assets/favicon/android-chrome-512x512.png
diff --git a/src/assets/graphics/favicon/apple-touch-icon.png b/src/assets/favicon/apple-touch-icon.png
similarity index 100%
rename from src/assets/graphics/favicon/apple-touch-icon.png
rename to src/assets/favicon/apple-touch-icon.png
diff --git a/src/assets/graphics/favicon/favicon.ico b/src/assets/favicon/favicon.ico
similarity index 100%
rename from src/assets/graphics/favicon/favicon.ico
rename to src/assets/favicon/favicon.ico
diff --git a/src/assets/graphics/favicon/icon-mask.png b/src/assets/favicon/icon-mask.png
similarity index 100%
rename from src/assets/graphics/favicon/icon-mask.png
rename to src/assets/favicon/icon-mask.png
diff --git a/src/assets/graphics/favicon/site.webmanifest b/src/assets/favicon/site.webmanifest
similarity index 100%
rename from src/assets/graphics/favicon/site.webmanifest
rename to src/assets/favicon/site.webmanifest