From 78715c75ea29590e916872fe0a2bd2ce77f28e85 Mon Sep 17 00:00:00 2001
From: Serghei Iakovlev <egrep@protonmail.ch>
Date: Mon, 2 May 2022 02:36:22 +0200
Subject: Rework icons

---
 layouts/partials/head.html    | 11 +++++++----
 layouts/partials/sidebar.html |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'layouts/partials')

diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index fe1a261..7d06d79 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -19,13 +19,16 @@
     {{ partial "styles.html" . -}}
     {{ partial "scripts.html" . -}}
 
-    <link rel="apple-touch-icon-precomposed" sizes="180x180" href="{{ "apple-touch-icon-precomposed.png" | relURL }}">
-    <link rel="shortcut icon" href="{{ "favicon.ico" | relURL }}">
+    {{- /* Favicons */}}
+    <link rel="icon" href="{{ site.Params.assets.favicon | default "favicon.ico" | relURL }}" sizes="any"><!-- 32×32 -->
+    <link rel="icon" href="{{ site.Params.assets.svgicon | default "icon.svg" | relURL }}" type="image/svg+xml">
+    <link rel="apple-touch-icon" href="{{ site.Params.assets.apple_touch_icon | default "apple-touch-icon.png" | relURL }}"><!-- 180×180 -->
+    <link rel="manifest" href="{{ site.Params.assets.webmanifest | default "manifest.webmanifest" | relURL }}">
 
     {{- /* RSS */}}
-    {{ range .AlternativeOutputFormats -}}
+    {{ range .AlternativeOutputFormats }}
     <link rel="{{ .Rel }}" type="{{ .MediaType.Type | html }}" title="{{ $.Site.Title }}" href="{{ .Permalink | safeURL }}">
-    {{ end -}}
+    {{- end -}}
     {{- range .AllTranslations -}}
     <link rel="alternate" hreflang="{{ .Lang }}" href="{{ .Permalink }}">
     {{ end -}}
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index 92f0897..f46c663 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -15,7 +15,7 @@
         {{- range site.Menus.nav }}
         {{- $active := or ($current.IsMenuCurrent "nav" .) ($current.HasMenuCurrent "nav" .) }}
         {{- $active = or $active (eq .Name $current.Title) }}
-        <a class="sidebar-nav-item {{ if $active }}active{{ end }}" href="{{ .URL }}">
+        <a class="sidebar-nav-item{{ if $active }} active{{ end }}" href="{{ .URL }}">
             {{- $text := print .Name | safeHTML -}}
             {{- $text -}}
         </a>
-- 
cgit v1.2.3