From c946e96522d51ca7d16a0c067a15c66a467b0cef Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Wed, 7 Feb 2024 11:52:39 +0000
Subject: [PATCH] Correct URLs to be relative to the BaseURL

---
 content/_index.md                              |  2 +-
 content/membership/index.md                    |  2 +-
 themes/lhs/assets/sass/leighhack.scss          |  2 +-
 themes/lhs/layouts/_default/baseof.html        |  2 +-
 themes/lhs/layouts/partials/design/bigcta.html |  2 +-
 themes/lhs/layouts/partials/footer.html        |  2 +-
 themes/lhs/layouts/partials/head.html          | 12 ++++++------
 themes/lhs/layouts/partials/header.html        |  4 ++--
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/content/_index.md b/content/_index.md
index df78e78..c608acf 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -2,7 +2,7 @@
 title: Welcome!
 subtitle: Leigh Hackspace is a social enterprise created for the benefit of our members and the wider Leigh community.
 layout: home
-hero_image: /images/rose_logo.svg
+hero_image: rose_logo.svg
 ---
 
 {{< rawhtml >}}
diff --git a/content/membership/index.md b/content/membership/index.md
index 1a90b29..a9564c8 100644
--- a/content/membership/index.md
+++ b/content/membership/index.md
@@ -1,7 +1,7 @@
 ---
 title: Join Leigh Hackspace
 subtitle: Become part of our community.
-hero_image: /images/hero-img.svg
+hero_image: hero-img.svg
 layout: membership
 show_cta: False
 outputs:
diff --git a/themes/lhs/assets/sass/leighhack.scss b/themes/lhs/assets/sass/leighhack.scss
index 5c74f9c..a2007aa 100644
--- a/themes/lhs/assets/sass/leighhack.scss
+++ b/themes/lhs/assets/sass/leighhack.scss
@@ -3,7 +3,7 @@
 // Additional fonts
 @font-face {
 	font-family: 'Transport Medium';
-	src: url('/fonts/transport-medium.woff2') format('woff2');
+	src: url('../fonts/transport-medium.woff2') format('woff2');
 }
 
 // Hackspace Branding 
diff --git a/themes/lhs/layouts/_default/baseof.html b/themes/lhs/layouts/_default/baseof.html
index 06bfb2a..d35fa6d 100644
--- a/themes/lhs/layouts/_default/baseof.html
+++ b/themes/lhs/layouts/_default/baseof.html
@@ -29,7 +29,7 @@
                                 {{ if .Params.hero_image }}
                                 <div class="column is-half">
                                     {{ block "hero-image" . }}
-                                    <img class="image hero-img" src="{{ .Params.hero_image }}">
+                                    <img class="image hero-img" src="{{ .Site.BaseURL }}images/{{ .Params.hero_image }}">
                                     {{ end }}
                                 </div>
                                 {{ end }}
diff --git a/themes/lhs/layouts/partials/design/bigcta.html b/themes/lhs/layouts/partials/design/bigcta.html
index 2f91e01..7c73c0e 100644
--- a/themes/lhs/layouts/partials/design/bigcta.html
+++ b/themes/lhs/layouts/partials/design/bigcta.html
@@ -3,7 +3,7 @@
         <div class="columns is-vcentered has-text-centered-mobile">
 
             <div class="column">
-                <img class="cta-img" src="/images/hero-img.svg">
+                <img class="cta-img" src="{{ .Site.BaseURL }}images/hero-img.svg">
             </div>
 
             <div class="column">
diff --git a/themes/lhs/layouts/partials/footer.html b/themes/lhs/layouts/partials/footer.html
index a548a9e..9329714 100644
--- a/themes/lhs/layouts/partials/footer.html
+++ b/themes/lhs/layouts/partials/footer.html
@@ -3,7 +3,7 @@
         <div class="columns">
 
             <div class="column is-1 is-pull-right-touch is-hidden-mobile">
-                <img src="/images/rose_logo.svg">
+                <img src="{{ .Site.BaseURL }}images/rose_logo.svg">
             </div>
 
             <div class="column is-4">
diff --git a/themes/lhs/layouts/partials/head.html b/themes/lhs/layouts/partials/head.html
index 0b89af9..7b48299 100644
--- a/themes/lhs/layouts/partials/head.html
+++ b/themes/lhs/layouts/partials/head.html
@@ -8,15 +8,15 @@
 {{ template "_internal/twitter_cards.html" . }}
 
 <!-- favicons -->
-<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
-<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
-<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
-<link rel="manifest" href="/site.webmanifest">
-<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#b91d47">
+<link rel="apple-touch-icon" sizes="180x180" href="{{ .Site.BaseURL }}apple-touch-icon.png">
+<link rel="icon" type="image/png" sizes="32x32" href="{{ .Site.BaseURL }}favicon-32x32.png">
+<link rel="icon" type="image/png" sizes="16x16" href="{{ .Site.BaseURL }}favicon-16x16.png">
+<link rel="manifest" href="{{ .Site.BaseURL }}site.webmanifest">
+<link rel="mask-icon" href="{{ .Site.BaseURL }}safari-pinned-tab.svg" color="#b91d47">
 <meta name="msapplication-TileColor" content="#b91d47">
 <meta name="theme-color" content="#ffffff">
 
-<link rel="alternate" type="application/rss+xml" href="{{.Site.BaseURL }}blog/index.xml" title="{{ .Site.Title }}">
+<link rel="alternate" type="application/rss+xml" href="{{ .Site.BaseURL }}blog/index.xml" title="{{ .Site.Title }}">
 <link rel="alternate" type="text/calendar" href="https://api.leighhack.org/events.ics" title="{{ .Site.Title }} Events">
 <link rel="canonical" href="{{ .Permalink }}">
 
diff --git a/themes/lhs/layouts/partials/header.html b/themes/lhs/layouts/partials/header.html
index 99dd9cf..12dce8f 100644
--- a/themes/lhs/layouts/partials/header.html
+++ b/themes/lhs/layouts/partials/header.html
@@ -2,8 +2,8 @@
     <div class="container">
 
         <div class="navbar-brand" style="flex-grow: 1;">
-            <a class="navbar-item" href="/">
-                <img class="site-logo" src="/images/rose_logo.svg" alt="" width="70">
+            <a class="navbar-item" href="{{ .Site.BaseURL }}">
+                <img class="site-logo" src="{{ .Site.BaseURL }}images/rose_logo.svg" alt="" width="70">
                 <span class="site-logo-text">Leigh<br/>Hackspace</span>
             </a>
             <a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false" data-target="navbar">