From 1a98f70180824c787ca3ce67f109b5c36720eb56 Mon Sep 17 00:00:00 2001
From: Michael Hulse <mickyhulse@gmail.com>
Date: Tue, 18 Oct 2022 20:42:13 -0700
Subject: [PATCH 1/2] Move logo to its own partial

---
 layouts/partials/header/basic.html     | 22 +---------------------
 layouts/partials/header/hamburger.html | 22 +---------------------
 layouts/partials/header/logo.html      | 21 +++++++++++++++++++++
 3 files changed, 23 insertions(+), 42 deletions(-)
 create mode 100644 layouts/partials/header/logo.html

diff --git a/layouts/partials/header/basic.html b/layouts/partials/header/basic.html
index 422a380c..b6edb690 100644
--- a/layouts/partials/header/basic.html
+++ b/layouts/partials/header/basic.html
@@ -2,27 +2,7 @@
   <nav class="flex justify-between">
     {{/* Site logo/title */}}
     <div>
-      {{ if .Site.Params.Logo -}}
-        {{ $logo := resources.Get .Site.Params.Logo }}
-        {{ if $logo }}
-          <a href="{{ "" | relLangURL }}">
-            <img
-              src="{{ $logo.RelPermalink }}"
-              width="{{ div $logo.Width 2 }}"
-              height="{{ div $logo.Height 2 }}"
-              class="max-h-[10rem] max-w-[10rem] object-scale-down object-left"
-              alt="{{ .Site.Title }}"
-            />
-          </a>
-        {{ end }}
-      {{ else }}
-        <a
-          class="decoration-primary-500 hover:underline hover:decoration-2 hover:underline-offset-2"
-          rel="me"
-          href="{{ "" | relLangURL }}"
-          >{{ .Site.Title | markdownify | emojify }}</a
-        >
-      {{- end }}
+      {{ partial "header/logo.html" . }}
       {{ partial "translations.html" . }}
     </div>
     {{/* Main menu */}}
diff --git a/layouts/partials/header/hamburger.html b/layouts/partials/header/hamburger.html
index 129be80c..081de54e 100644
--- a/layouts/partials/header/hamburger.html
+++ b/layouts/partials/header/hamburger.html
@@ -2,27 +2,7 @@
   <nav class="flex justify-between">
     {{/* Site logo/title */}}
     <div class="z-40">
-      {{ if .Site.Params.Logo -}}
-        {{ $logo := resources.Get .Site.Params.Logo }}
-        {{ if $logo }}
-          <a href="{{ "" | relLangURL }}">
-            <img
-              src="{{ $logo.RelPermalink }}"
-              width="{{ div $logo.Width 2 }}"
-              height="{{ div $logo.Height 2 }}"
-              class="max-h-[10rem] max-w-[10rem] object-scale-down object-left"
-              alt="{{ .Site.Title }}"
-            />
-          </a>
-        {{ end }}
-      {{ else }}
-        <a
-          class="decoration-primary-500 hover:underline hover:decoration-2 hover:underline-offset-2"
-          rel="me"
-          href="{{ "" | relLangURL }}"
-          >{{ .Site.Title | markdownify | emojify }}</a
-        >
-      {{- end }}
+      {{ partial "header/logo.html" . }}
       {{ partial "translations.html" . }}
     </div>
     {{/* Hamburger menu */}}
diff --git a/layouts/partials/header/logo.html b/layouts/partials/header/logo.html
new file mode 100644
index 00000000..a0a8b7f8
--- /dev/null
+++ b/layouts/partials/header/logo.html
@@ -0,0 +1,21 @@
+{{ if .Site.Params.Logo -}}
+{{ $logo := resources.Get .Site.Params.Logo }}
+{{ if $logo }}
+  <a href="{{ "" | relLangURL }}">
+    <img
+      src="{{ $logo.RelPermalink }}"
+      width="{{ div $logo.Width 2 }}"
+      height="{{ div $logo.Height 2 }}"
+      class="max-w-[10rem] max-h-[10rem] object-scale-down object-left"
+      alt="{{ .Site.Title }}"
+    />
+  </a>
+{{ end }}
+{{ else }}
+<a
+  class="decoration-primary-500 hover:underline hover:decoration-2 hover:underline-offset-2"
+  rel="me"
+  href="{{ "" | relLangURL }}"
+  >{{ .Site.Title | markdownify | emojify }}</a
+>
+{{- end }}

From beebfe08452a660122441db0ad0ef43b4c7ccf60 Mon Sep 17 00:00:00 2001
From: James Panther <4462786+jpanther@users.noreply.github.com>
Date: Mon, 7 Nov 2022 15:54:21 +1100
Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=9A=9A=20Move=20logo=20partial=20to?=
 =?UTF-8?q?=20partials=20directory?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 layouts/partials/header/basic.html     |  2 +-
 layouts/partials/header/hamburger.html |  2 +-
 layouts/partials/header/logo.html      | 21 ---------------------
 layouts/partials/logo.html             | 21 +++++++++++++++++++++
 4 files changed, 23 insertions(+), 23 deletions(-)
 delete mode 100644 layouts/partials/header/logo.html
 create mode 100644 layouts/partials/logo.html

diff --git a/layouts/partials/header/basic.html b/layouts/partials/header/basic.html
index b6edb690..fc7c5488 100644
--- a/layouts/partials/header/basic.html
+++ b/layouts/partials/header/basic.html
@@ -2,7 +2,7 @@
   <nav class="flex justify-between">
     {{/* Site logo/title */}}
     <div>
-      {{ partial "header/logo.html" . }}
+      {{ partial "logo.html" . }}
       {{ partial "translations.html" . }}
     </div>
     {{/* Main menu */}}
diff --git a/layouts/partials/header/hamburger.html b/layouts/partials/header/hamburger.html
index 081de54e..6d460ed8 100644
--- a/layouts/partials/header/hamburger.html
+++ b/layouts/partials/header/hamburger.html
@@ -2,7 +2,7 @@
   <nav class="flex justify-between">
     {{/* Site logo/title */}}
     <div class="z-40">
-      {{ partial "header/logo.html" . }}
+      {{ partial "logo.html" . }}
       {{ partial "translations.html" . }}
     </div>
     {{/* Hamburger menu */}}
diff --git a/layouts/partials/header/logo.html b/layouts/partials/header/logo.html
deleted file mode 100644
index a0a8b7f8..00000000
--- a/layouts/partials/header/logo.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{{ if .Site.Params.Logo -}}
-{{ $logo := resources.Get .Site.Params.Logo }}
-{{ if $logo }}
-  <a href="{{ "" | relLangURL }}">
-    <img
-      src="{{ $logo.RelPermalink }}"
-      width="{{ div $logo.Width 2 }}"
-      height="{{ div $logo.Height 2 }}"
-      class="max-w-[10rem] max-h-[10rem] object-scale-down object-left"
-      alt="{{ .Site.Title }}"
-    />
-  </a>
-{{ end }}
-{{ else }}
-<a
-  class="decoration-primary-500 hover:underline hover:decoration-2 hover:underline-offset-2"
-  rel="me"
-  href="{{ "" | relLangURL }}"
-  >{{ .Site.Title | markdownify | emojify }}</a
->
-{{- end }}
diff --git a/layouts/partials/logo.html b/layouts/partials/logo.html
new file mode 100644
index 00000000..9e610fca
--- /dev/null
+++ b/layouts/partials/logo.html
@@ -0,0 +1,21 @@
+{{ if .Site.Params.Logo -}}
+  {{ $logo := resources.Get .Site.Params.Logo }}
+  {{ if $logo }}
+    <a href="{{ "" | relLangURL }}">
+      <img
+        src="{{ $logo.RelPermalink }}"
+        width="{{ div $logo.Width 2 }}"
+        height="{{ div $logo.Height 2 }}"
+        class="max-h-[10rem] max-w-[10rem] object-scale-down object-left"
+        alt="{{ .Site.Title }}"
+      />
+    </a>
+  {{ end }}
+{{ else }}
+  <a
+    class="decoration-primary-500 hover:underline hover:decoration-2 hover:underline-offset-2"
+    rel="me"
+    href="{{ "" | relLangURL }}"
+    >{{ .Site.Title | markdownify | emojify }}</a
+  >
+{{- end }}