From 751f1c7d810a7ca77e5d67a1c65637eae4188e02 Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Fri, 11 Aug 2023 08:05:04 -0700
Subject: [PATCH] Tweak all the icons

Make them a little bigger. Clean up the view boxes.
Use <img> instead of backgrounds of <a> tags so the Mastodon logo does not get clipped.
---
 assets/styles/root.css                       | 10 +-------
 assets/styles/root/050_site_header.css       | 24 ++++++++++++++++++++
 layouts/partials/header.html                 |  7 +++++-
 static/icons/{rss-dark.svg => feed-dark.svg} |  0
 static/icons/{rss.svg => feed.svg}           |  6 ++---
 5 files changed, 34 insertions(+), 13 deletions(-)
 rename static/icons/{rss-dark.svg => feed-dark.svg} (100%)
 rename static/icons/{rss.svg => feed.svg} (98%)

diff --git a/assets/styles/root.css b/assets/styles/root.css
index 9a160a1..1fddf29 100644
--- a/assets/styles/root.css
+++ b/assets/styles/root.css
@@ -48,13 +48,9 @@
 
     --transition-duration: 0.7s;
 
-    --social-menu-padding: 1rem;
     --menu-icon-size: 20px;
-    --mastodon-icon: url(/icons/mastodon.svg);
-    --github-icon: url(/icons/github.svg);
-    --instagram-icon: url(/icons/instagram.svg);
-    --feed-icon: url(/icons/rss.svg);
 }
+
 @media (prefers-color-scheme: dark) {
     :root {
         --background: var(--black);
@@ -76,10 +72,6 @@
         --tag-hover-background-color: rgb(var(--super-dk-gray));
         --tag-hover-foreground-color: rgb(var(--mid-gray));
 
-        --mastodon-icon: url(/icons/mastodon-dark.svg);
-        --github-icon: url(/icons/github-dark.svg);
-        --instagram-icon: url(/icons/instagram-dark.svg);
-        --feed-icon: url(/icons/rss-dark.svg);
     }
 }
 
diff --git a/assets/styles/root/050_site_header.css b/assets/styles/root/050_site_header.css
index c7fee94..6f9f5b0 100644
--- a/assets/styles/root/050_site_header.css
+++ b/assets/styles/root/050_site_header.css
@@ -1,4 +1,23 @@
 @layer root {
+    :root {
+        --mastodon-icon: url(/icons/mastodon.svg);
+        --github-icon: url(/icons/github.svg);
+        --instagram-icon: url(/icons/instagram.svg);
+        --feed-icon: url(/icons/feed.svg);
+
+        --social-menu-padding: 1rem;
+    }
+
+    @media (prefers-color-scheme: dark) {
+        :root {
+            --mastodon-icon: url(/icons/mastodon-dark.svg);
+            --github-icon: url(/icons/github-dark.svg);
+            --instagram-icon: url(/icons/instagram-dark.svg);
+            --feed-icon: url(/icons/feed-dark.svg);
+        }
+    }
+
+
     header.site h1 > a:hover { text-decoration: none; }
 
     header.site {
@@ -84,4 +103,9 @@
         color: var(--dark);
         padding: 0 0.5rem;
     }
+
+    #social-menu-mastodon img { content: var(--mastodon-icon); }
+    #social-menu-github img { content: var(--github-icon); }
+    #social-menu-instagram img { content: var(--instagram-icon); }
+    #social-menu-feed img { content: var(--feed-icon); }
 }
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index fa4bdd0..562229e 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -9,8 +9,13 @@
     <nav class="social">
       {{ with site.Menus.social }}
         {{- range . -}}
+        {{- $id := .Identifier -}}
         {{- $targetBlank := .Params.targetBlank | default true -}}
-        <li><a style="--url: var(--{{ .Identifier }}-icon)" href="{{ .URL }}" {{ if $targetBlank }}target="_blank"{{ end }} aria-label="{{ .Name }}"><span>{{ .Params.shortName | default .Name }}</span></a></li>
+        <li id="social-menu-{{ $id }}">
+          <a href="{{ .URL }}" {{ if $targetBlank }}target="_blank"{{ end }} aria-label="{{ .Name }}">
+            <img alt="{{ .Name }}">
+          </a>
+        </li>
         {{- end -}}
       {{ end }}
     </nav>
diff --git a/static/icons/rss-dark.svg b/static/icons/feed-dark.svg
similarity index 100%
rename from static/icons/rss-dark.svg
rename to static/icons/feed-dark.svg
diff --git a/static/icons/rss.svg b/static/icons/feed.svg
similarity index 98%
rename from static/icons/rss.svg
rename to static/icons/feed.svg
index 1607495..4d46b35 100644
--- a/static/icons/rss.svg
+++ b/static/icons/feed.svg
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--Generator: Apple Native CoreSVG 149-->
-
 <svg
    version="1.1"
-   width="53"
-   height="53"
+   viewBox="1 5 48 48"
+   width="48"
+   height="48"
    id="svg61"
    sodipodi:docname="rss.svg"
    inkscape:version="1.1.1 (c3084ef, 2021-09-22)"