From c055dd0766b225bf154661aa98f019e37b9206e0 Mon Sep 17 00:00:00 2001
From: Alex Manning <me@alex-m.co.uk>
Date: Wed, 1 Dec 2021 21:54:50 +0000
Subject: [PATCH] Favicon

---
 assets/images/logo.svg     | 38 ++++++++++++++++++++++----------------
 config.toml                |  5 +++++
 layouts/partials/head.html | 10 ++++++----
 layouts/partials/nav.html  |  2 +-
 4 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/assets/images/logo.svg b/assets/images/logo.svg
index 4fa6928..dfd38f4 100644
--- a/assets/images/logo.svg
+++ b/assets/images/logo.svg
@@ -1,14 +1,20 @@
+<!-- Hugo Definitions
+
+{{ $extrabold := resources.Get "fonts/nunitosans/NunitoSans-ExtraBold.ttf" }}
+{{ $text := .ctx.Site.Params.group }}
+{{ $fgcolor := cond (eq .type "favicon") .ctx.Site.Params.faviconColor .ctx.Site.Params.logoColor }}
+
+-->
 <svg xmlns="http://www.w3.org/2000/svg" id="svg8" version="1.1" viewBox="0 0 91.666 33.506" height="126.636" width="346.455">
   <defs>
     <style>
-    /* {{ $extrabold := resources.Get "fonts/nunitosans/NunitoSans-ExtraBold.ttf" }} */
     @font-face {
                 font-family:"Nunito Sans";
                 src: url({{ $extrabold.RelPermalink }});
                 font-weight: 900;
                 }
-    .color-fill {
-        fill: {{ .Site.Params.logoColor }} ;
+    .fg-color {
+        fill: {{ $fgcolor }} ;
                 }
     .logo-text {
         font-family: "Nunito Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
@@ -19,20 +25,20 @@
   <g transform="translate(-7.084 -7.438)" id="layer1">
     <g transform="matrix(.03528 0 0 -.03528 58.43 115.335)" id="g20">
       <g transform="translate(-1714.286 1864.286)" id="g98">
-        <path d="M258.801 622.473l47.105 56.425c32.617-26.914 66.789-44.003 108.203-44.003 32.621 0 52.297 12.949 52.297 34.16v1.035c0 20.215-12.429 30.547-73.008 46.094-73.007 18.632-120.117 38.828-120.117 110.8V828c0 65.762 52.813 109.258 126.856 109.258 52.801 0 97.851-16.57 134.621-46.094l-41.438-60.059c-32.097 22.266-63.672 35.723-94.238 35.723-30.527 0-46.594-13.965-46.594-31.562v-1.055c0-23.809 15.539-31.582 78.196-47.617 73.515-19.16 114.921-45.567 114.921-108.731v-1.035c0-71.953-54.875-112.344-133.046-112.344-54.883 0-110.274 19.161-153.758 57.989" id="path22" class="color-fill" fill-opacity="1" fill-rule="nonzero" stroke="none"/>
-        <path d="M575.352 706.848v1.054c0 79.2 60.578 144.434 145.476 144.434 52.317 0 84.926-17.598 110.82-46.582l-48.152-51.797c-17.605 18.652-35.207 30.566-63.164 30.566-39.355 0-67.312-34.707-67.312-75.585v-1.036c0-42.461 27.429-76.64 70.41-76.64 26.414 0 44.527 11.386 63.679 29.511l46.082-46.601c-26.921-29.492-57.976-50.723-113.386-50.723-83.36 0-144.453 64.18-144.453 143.399" id="path24" class="color-fill" fill-opacity="1" fill-rule="nonzero" stroke="none"/>
-        <path d="M1071.23 706.848v1.054c0 40.899-29.51 76.621-73 76.621-45.039 0-71.968-34.707-71.968-75.585v-1.036c0-40.918 29.508-76.64 72.996-76.64 45.052 0 71.972 34.687 71.972 75.586m-222.625 0v1.054c0 79.727 64.208 144.434 150.653 144.434 85.952 0 149.622-63.672 149.622-143.398v-1.036c0-79.746-64.2-144.453-150.65-144.453-85.957 0-149.625 63.672-149.625 143.399" id="path26" class="color-fill" fill-opacity="1" fill-rule="nonzero" stroke="none"/>
-        <path d="M1179.59 667.512V847.16h78.7V692.355c0-37.285 17.6-56.425 47.63-56.425 30.02 0 49.18 19.14 49.18 56.425V847.16h78.7v-277.5h-78.7v39.336c-18.13-23.281-41.42-44.512-81.28-44.512-59.54 0-94.23 39.336-94.23 103.028" id="path28" class="color-fill" fill-opacity="1" fill-rule="nonzero" stroke="none"/>
-        <path d="M1479.52 648.352v269.746h78.69V847.16h65.26v-67.305h-65.26V661.301c0-18.125 7.78-26.934 25.37-26.934 14.49 0 27.44 3.633 38.83 9.844v-63.164c-16.56-9.844-35.71-16.055-62.13-16.055-48.14 0-80.76 19.16-80.76 83.36" id="path30" class="color-fill" fill-opacity="1" fill-rule="nonzero" stroke="none"/>
-        <path d="M1658.12 606.418l33.66 51.777c30.02-21.757 61.6-33.144 87.48-33.144 22.78 0 33.14 8.281 33.14 20.703v1.035c0 17.109-26.92 22.793-57.48 32.109-38.82 11.387-82.82 29.512-82.82 83.36v1.035c0 56.426 45.56 88.008 101.47 88.008 35.21 0 73.51-11.895 103.56-32.09l-30.05-54.375c-27.42 16.055-54.87 25.898-75.07 25.898-19.16 0-28.98-8.3-28.98-19.16v-1.035c0-15.527 26.4-22.793 56.41-33.144 38.84-12.95 83.89-31.582 83.89-82.305v-1.035c0-61.621-46.08-89.571-106.12-89.571-38.84 0-82.34 12.93-119.09 41.934" id="path32" class="color-fill" fill-opacity="1" fill-rule="nonzero" stroke="none"/>
-        <path d="M2264.67 864.504c22.45-34.414 33.76-73.789 37.3-100.488h40.99c-3.43 32.636-16.61 80.449-44.18 122.734-32.8 50.289-75.51 76.895-123.5 76.93h-.29c-36.6 0-70.86-16.453-94.01-45.141-24.32-30.168-33.53-69.172-25.27-107.023l39.78 8.691c-5.55 25.352.88 52.559 17.18 72.773 15.62 19.329 37.73 29.977 62.33 29.977h.21c42.46-.027 72.08-31.793 89.46-58.453" id="path34" class="color-fill" fill-opacity="1" fill-rule="nonzero" stroke="none"/>
-        <path d="M2560.56 579.27c-15.93 22.05-27.55 48.457-32.69 73.867h-41.36c3.18-19.844 11.62-52.578 33.81-87.129-13.91-23.281-38.88-46.27-65.28-60.02-.02 0-.03 0-.05.02-.01-.02-.03-.02-.04-.02-26.41 13.75-51.38 36.739-65.29 60.02 22.21 34.551 30.62 67.285 33.8 87.129h-41.37c-5.12-25.41-16.74-51.817-32.67-73.867l-6.93-9.61 4.94-10.781c17.29-37.715 57.2-75.527 99.32-94.102l8.18-3.613h.11l8.18 3.613c42.12 18.575 82.03 56.387 99.32 94.102l4.94 10.781-6.92 9.61" id="path36" class="color-fill" fill-opacity="1" fill-rule="nonzero" stroke="none"/>
-        <path d="M2645.3 864.504c-22.45-34.414-33.76-73.789-37.28-100.488h-41c3.43 32.636 16.6 80.449 44.18 122.734 32.79 50.289 75.5 76.895 123.5 76.93h.29c36.59 0 70.84-16.453 93.99-45.141 24.33-30.168 33.54-69.172 25.27-107.023l-39.77 8.691c5.54 25.352-.88 52.559-17.17 72.773-15.63 19.329-37.73 29.977-62.34 29.977h-.2c-42.47-.027-72.08-31.793-89.47-58.453" id="path38" class="color-fill" fill-opacity="1" fill-rule="nonzero" stroke="none"/>
-        <path d="M2383.84 764.016h40.99c-5.11 47.226-23.64 88.379-40.05 124.824-16.41 36.367-31.88 70.738-31.66 104.98.34 39.38 22.79 79.52 60.07 107.43 6.53 4.92 25.11 19.18 41.8 34.5 16.68-15.32 35.25-29.58 41.79-34.5 37.28-27.91 59.73-68.05 60.08-107.43.21-34.242-15.26-68.613-31.65-104.98-16.42-36.445-34.95-77.598-40.07-124.824h40.99c5.07 38.984 20.89 74.082 36.2 108.105 18.27 40.527 35.51 78.82 35.25 122.008-.47 52.051-29.02 104.251-76.38 139.681-5.58 4.23-34.63 26.37-51.32 44.35l-14.89 16.06-14.88-16.06c-16.71-17.98-45.76-40.12-51.35-44.35-47.34-35.43-75.89-87.63-76.36-139.681-.27-43.188 16.98-81.481 35.23-122.008 15.33-34.023 31.14-69.121 36.21-108.105" id="path40" class="color-fill" fill-opacity="1" fill-rule="nonzero" stroke="none"/>
-        <path d="M2222.43 689.055h465.11v39.023h-465.11v-39.023" id="path42" class="color-fill" fill-opacity="1" fill-rule="nonzero" stroke="none"/>
+        <path d="M258.801 622.473l47.105 56.425c32.617-26.914 66.789-44.003 108.203-44.003 32.621 0 52.297 12.949 52.297 34.16v1.035c0 20.215-12.429 30.547-73.008 46.094-73.007 18.632-120.117 38.828-120.117 110.8V828c0 65.762 52.813 109.258 126.856 109.258 52.801 0 97.851-16.57 134.621-46.094l-41.438-60.059c-32.097 22.266-63.672 35.723-94.238 35.723-30.527 0-46.594-13.965-46.594-31.562v-1.055c0-23.809 15.539-31.582 78.196-47.617 73.515-19.16 114.921-45.567 114.921-108.731v-1.035c0-71.953-54.875-112.344-133.046-112.344-54.883 0-110.274 19.161-153.758 57.989" id="path22" class="fg-color" fill-opacity="1" fill-rule="nonzero" stroke="none"/>
+        <path d="M575.352 706.848v1.054c0 79.2 60.578 144.434 145.476 144.434 52.317 0 84.926-17.598 110.82-46.582l-48.152-51.797c-17.605 18.652-35.207 30.566-63.164 30.566-39.355 0-67.312-34.707-67.312-75.585v-1.036c0-42.461 27.429-76.64 70.41-76.64 26.414 0 44.527 11.386 63.679 29.511l46.082-46.601c-26.921-29.492-57.976-50.723-113.386-50.723-83.36 0-144.453 64.18-144.453 143.399" id="path24" class="fg-color" fill-opacity="1" fill-rule="nonzero" stroke="none"/>
+        <path d="M1071.23 706.848v1.054c0 40.899-29.51 76.621-73 76.621-45.039 0-71.968-34.707-71.968-75.585v-1.036c0-40.918 29.508-76.64 72.996-76.64 45.052 0 71.972 34.687 71.972 75.586m-222.625 0v1.054c0 79.727 64.208 144.434 150.653 144.434 85.952 0 149.622-63.672 149.622-143.398v-1.036c0-79.746-64.2-144.453-150.65-144.453-85.957 0-149.625 63.672-149.625 143.399" id="path26" class="fg-color" fill-opacity="1" fill-rule="nonzero" stroke="none"/>
+        <path d="M1179.59 667.512V847.16h78.7V692.355c0-37.285 17.6-56.425 47.63-56.425 30.02 0 49.18 19.14 49.18 56.425V847.16h78.7v-277.5h-78.7v39.336c-18.13-23.281-41.42-44.512-81.28-44.512-59.54 0-94.23 39.336-94.23 103.028" id="path28" class="fg-color" fill-opacity="1" fill-rule="nonzero" stroke="none"/>
+        <path d="M1479.52 648.352v269.746h78.69V847.16h65.26v-67.305h-65.26V661.301c0-18.125 7.78-26.934 25.37-26.934 14.49 0 27.44 3.633 38.83 9.844v-63.164c-16.56-9.844-35.71-16.055-62.13-16.055-48.14 0-80.76 19.16-80.76 83.36" id="path30" class="fg-color" fill-opacity="1" fill-rule="nonzero" stroke="none"/>
+        <path d="M1658.12 606.418l33.66 51.777c30.02-21.757 61.6-33.144 87.48-33.144 22.78 0 33.14 8.281 33.14 20.703v1.035c0 17.109-26.92 22.793-57.48 32.109-38.82 11.387-82.82 29.512-82.82 83.36v1.035c0 56.426 45.56 88.008 101.47 88.008 35.21 0 73.51-11.895 103.56-32.09l-30.05-54.375c-27.42 16.055-54.87 25.898-75.07 25.898-19.16 0-28.98-8.3-28.98-19.16v-1.035c0-15.527 26.4-22.793 56.41-33.144 38.84-12.95 83.89-31.582 83.89-82.305v-1.035c0-61.621-46.08-89.571-106.12-89.571-38.84 0-82.34 12.93-119.09 41.934" id="path32" class="fg-color" fill-opacity="1" fill-rule="nonzero" stroke="none"/>
+        <path d="M2264.67 864.504c22.45-34.414 33.76-73.789 37.3-100.488h40.99c-3.43 32.636-16.61 80.449-44.18 122.734-32.8 50.289-75.51 76.895-123.5 76.93h-.29c-36.6 0-70.86-16.453-94.01-45.141-24.32-30.168-33.53-69.172-25.27-107.023l39.78 8.691c-5.55 25.352.88 52.559 17.18 72.773 15.62 19.329 37.73 29.977 62.33 29.977h.21c42.46-.027 72.08-31.793 89.46-58.453" id="path34" class="fg-color" fill-opacity="1" fill-rule="nonzero" stroke="none"/>
+        <path d="M2560.56 579.27c-15.93 22.05-27.55 48.457-32.69 73.867h-41.36c3.18-19.844 11.62-52.578 33.81-87.129-13.91-23.281-38.88-46.27-65.28-60.02-.02 0-.03 0-.05.02-.01-.02-.03-.02-.04-.02-26.41 13.75-51.38 36.739-65.29 60.02 22.21 34.551 30.62 67.285 33.8 87.129h-41.37c-5.12-25.41-16.74-51.817-32.67-73.867l-6.93-9.61 4.94-10.781c17.29-37.715 57.2-75.527 99.32-94.102l8.18-3.613h.11l8.18 3.613c42.12 18.575 82.03 56.387 99.32 94.102l4.94 10.781-6.92 9.61" id="path36" class="fg-color" fill-opacity="1" fill-rule="nonzero" stroke="none"/>
+        <path d="M2645.3 864.504c-22.45-34.414-33.76-73.789-37.28-100.488h-41c3.43 32.636 16.6 80.449 44.18 122.734 32.79 50.289 75.5 76.895 123.5 76.93h.29c36.59 0 70.84-16.453 93.99-45.141 24.33-30.168 33.54-69.172 25.27-107.023l-39.77 8.691c5.54 25.352-.88 52.559-17.17 72.773-15.63 19.329-37.73 29.977-62.34 29.977h-.2c-42.47-.027-72.08-31.793-89.47-58.453" id="path38" class="fg-color" fill-opacity="1" fill-rule="nonzero" stroke="none"/>
+        <path d="M2383.84 764.016h40.99c-5.11 47.226-23.64 88.379-40.05 124.824-16.41 36.367-31.88 70.738-31.66 104.98.34 39.38 22.79 79.52 60.07 107.43 6.53 4.92 25.11 19.18 41.8 34.5 16.68-15.32 35.25-29.58 41.79-34.5 37.28-27.91 59.73-68.05 60.08-107.43.21-34.242-15.26-68.613-31.65-104.98-16.42-36.445-34.95-77.598-40.07-124.824h40.99c5.07 38.984 20.89 74.082 36.2 108.105 18.27 40.527 35.51 78.82 35.25 122.008-.47 52.051-29.02 104.251-76.38 139.681-5.58 4.23-34.63 26.37-51.32 44.35l-14.89 16.06-14.88-16.06c-16.71-17.98-45.76-40.12-51.35-44.35-47.34-35.43-75.89-87.63-76.36-139.681-.27-43.188 16.98-81.481 35.23-122.008 15.33-34.023 31.14-69.121 36.21-108.105" id="path40" class="fg-color" fill-opacity="1" fill-rule="nonzero" stroke="none"/>
+        <path d="M2222.43 689.055h465.11v39.023h-465.11v-39.023" id="path42" class="fg-color" fill-opacity="1" fill-rule="nonzero" stroke="none"/>
         <g id="g44" transform="scale(10)">
-          <text transform="matrix(1 0 0 -1 24.94 28.372)" id="text48" writing-mode="lr-tb" class="logo-text color-fill" fill-opacity="1" fill-rule="nonzero" stroke="none">
-          <tspan x="0" y="0" id="tspan46">{{ .Site.Params.group }} </tspan>
+          <text transform="matrix(1 0 0 -1 24.94 28.372)" id="text48" writing-mode="lr-tb" class="logo-text fg-color" fill-opacity="1" fill-rule="nonzero" stroke="none">
+          <tspan x="0" y="0" id="tspan46">{{ $text }} </tspan>
           </text>
         </g>
       </g>
diff --git a/config.toml b/config.toml
index 76e9b09..9465353 100644
--- a/config.toml
+++ b/config.toml
@@ -29,3 +29,8 @@ suffixes = ['php']
 mediaType = "application/x-php"
 isPlainText = true
 permalinkable = true
+noUgly = true
+
+[params]
+scssOutputStyle = "compressed"
+scssEnableSourceMap = true
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 8f66b33..1f58990 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -2,17 +2,19 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
+    {{ $cssoptions := (dict "outputStyle" .Site.Params.scssOutputStyle "enableSourceMap" .Site.Params.scssEnableSourceMap) }}
+
     <!-- Main combined stylesheet -->
-    {{ $style := resources.Get "sass/main.scss" | resources.ToCSS | resources.Minify | resources.Fingerprint "sha512" }}
+    {{ $style := resources.Get "sass/main.scss" | resources.ToCSS $cssoptions | resources.Fingerprint "sha512" }}
     <link rel="stylesheet" href="{{ $style.RelPermalink }}" integrity="{{ $style.Data.Integrity }}">
 
     <!-- Scout font. -->
-    {{ $font := resources.Get "sass/nunitosans.scss" | resources.ExecuteAsTemplate "sass/nunitosans.scss" . | resources.ToCSS | resources.Minify | resources.Fingerprint "sha512" }}
+    {{ $font := resources.Get "sass/nunitosans.scss" | resources.ExecuteAsTemplate "sass/nunitosans.scss" . | resources.ToCSS $cssoptions | resources.Fingerprint "sha512" }}
     <link rel="stylesheet" href="{{ $font.RelPermalink }}" integrity="{{ $font.Data.Integrity }}">
 
     <!-- Favicons -->
-    {{ $logo := resources.Get "images/logo.svg" | resources.ExecuteAsTemplate "images/logo.svg" . | resources.Minify}}
-    <link rel="icon" href="{{ $logo.RelPermalink }}" type="image/svg+xml">
+    {{ $favicon := resources.Get "images/logo.svg" | resources.ExecuteAsTemplate "images/favicon.svg" (dict "ctx" . "type" "favicon") | resources.Minify}}
+    <link rel="icon" href="{{ $favicon.RelPermalink }}" type="image/svg+xml">
 
 
     <title>{{ if .Title }}{{ .Title }} | {{ end }}{{ .Site.Title }}</title>
diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html
index 1f2b836..bec5412 100644
--- a/layouts/partials/nav.html
+++ b/layouts/partials/nav.html
@@ -1,7 +1,7 @@
 <nav class="navbar navbar-expand-lg navbar-dark bg-primary">
     <div class="container-fluid">
         <a class="navbar-brand" href="{{ .Site.BaseURL }}">
-            {{ $logo := resources.Get "images/logo.svg" | resources.ExecuteAsTemplate "images/logo.svg" . | resources.Minify}}
+            {{ $logo := resources.Get "images/logo.svg" | resources.ExecuteAsTemplate "images/logo.svg" (dict "ctx" . "type" "main") | resources.Minify}}
             <img src="{{ $logo.RelPermalink }}" alt="{{ .Site.Params.group }}" height=100px>
         </a>
         <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarMain" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">