From 5c65dade972e2ff1f8a5441ea8e49f318e1ffaa9 Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Mon, 27 Dec 2021 12:17:45 -0700
Subject: [PATCH] Add RSS link to social links in the header

---
 layouts/_default/list.html       |  4 +--
 layouts/partials/header.html     | 11 ++++++--
 static/github.svg                |  1 -
 static/icons/github.svg          | 39 ++++++++++++++++++++++++++
 static/{ => icons}/instagram.svg |  0
 static/icons/rss.svg             | 48 ++++++++++++++++++++++++++++++++
 static/icons/twitter.svg         | 42 ++++++++++++++++++++++++++++
 static/styles/main.css           | 34 +++++++++++++++++++++-
 static/twitter.svg               |  1 -
 9 files changed, 172 insertions(+), 8 deletions(-)
 delete mode 100644 static/github.svg
 create mode 100644 static/icons/github.svg
 rename static/{ => icons}/instagram.svg (100%)
 create mode 100644 static/icons/rss.svg
 create mode 100644 static/icons/twitter.svg
 delete mode 100644 static/twitter.svg

diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 9750343..7d372ee 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,7 +1,9 @@
 
 {{ define "main" }}
 {{ if .Title }}
+<header>
 <h2 class="main-title">{{ .Title }}</h2>
+</header>
 {{ end }}
 
 {{ $pages := union .RegularPages .Sections }}
@@ -11,7 +13,6 @@
 
 {{ .Content }}
 
-<!-- Articles -->
 <ul class="post-list">
 {{ $paginator := .Paginate $pages }}
 {{ range $index, $page := $paginator.Pages }}
@@ -30,7 +31,6 @@
 {{ end }}
 </ul>
 
-<!-- Main Nav -->
 {{ if gt $paginator.TotalPages 1 }}
 <nav class="main-nav">
   {{ if $paginator.HasPrev }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 8087264..b4201a9 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -14,9 +14,14 @@
 
   <nav class="social">
     <menu>
-      <li><a style="--url: url(./twitter.svg)" href="https://twitter.com/erynofwales" target="_blank"><span>tw</span></a></li>
-      <li><a style="--url: url(./github.svg)" href="https://github.com/erynofwales" target="_blank"><span>gh</span></a></li>
-      <li><a style="--url: url(./instagram.svg)" href="https://instagram.com/erynofwales" target="_blank"><span>ig</span></a></li>
+      <li><a style="--url: url(/icons/twitter.svg)" href="https://twitter.com/erynofwales" target="_blank" aria-label="twitter"><span>tw</span></a></li>
+      <li><a style="--url: url(/icons/github.svg)" href="https://github.com/erynofwales" target="_blank" aria-label="github"><span>gh</span></a></li>
+      <li><a style="--url: url(/icons/instagram.svg)" href="https://instagram.com/erynofwales" target="_blank" aria-label="instagram"><span>ig</span></a></li>
+      {{ with .Site.GetPage "/blog" }}
+        {{ with .OutputFormats.Get "rss" }}
+        <li><a style="--url: url(/icons/rss.svg)" href="{{ .RelPermalink }}" aria-label="rss"><span>rss</span></a></li>
+        {{ end }}
+      {{ end }}
     </menu>
   </nav>
 </header>
diff --git a/static/github.svg b/static/github.svg
deleted file mode 100644
index 6068b15..0000000
--- a/static/github.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="-0.8 -1 17.6 17.6" xmlns="http://www.w3.org/2000/svg"><path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z" /></svg>
diff --git a/static/icons/github.svg b/static/icons/github.svg
new file mode 100644
index 0000000..bf91eb8
--- /dev/null
+++ b/static/icons/github.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="-0.8 -1 52.999999 52.999999"
+   version="1.1"
+   id="svg308"
+   sodipodi:docname="github.svg"
+   width="53"
+   height="53"
+   inkscape:version="1.1.1 (c3084ef, 2021-09-22)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs312" />
+  <sodipodi:namedview
+     id="namedview310"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     width="53px"
+     inkscape:zoom="9.1485733"
+     inkscape:cx="-7.0502797"
+     inkscape:cy="26.397559"
+     inkscape:window-width="1296"
+     inkscape:window-height="969"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg308" />
+  <path
+     d="m 25.7,3 c -13.26,0 -24,10.74 -24,24 0,10.62 6.87,19.59 16.41,22.77 1.2,0.21 1.65,-0.51 1.65,-1.14 0,-0.57 -0.03,-2.46 -0.03,-4.47 C 13.7,45.27 12.14,42.69 11.66,41.34 11.39,40.65 10.22,38.52 9.2,37.95 8.36,37.5 7.16,36.39 9.17,36.36 c 1.89,-0.03 3.24,1.74 3.69,2.46 2.16,3.63 5.61,2.61 6.99,1.98 0.21,-1.56 0.84,-2.61 1.53,-3.21 -5.34,-0.6 -10.92,-2.67 -10.92,-11.85 0,-2.61 0.93,-4.77 2.46,-6.45 -0.24,-0.6 -1.08,-3.06 0.24,-6.36 0,0 2.01,-0.63 6.6,2.46 1.92,-0.54 3.96,-0.81 6,-0.81 2.04,0 4.08,0.27 6,0.81 4.59,-3.12 6.6,-2.46 6.6,-2.46 1.32,3.3 0.48,5.76 0.24,6.36 1.53,1.68 2.46,3.81 2.46,6.45 0,9.21 -5.61,11.25 -10.95,11.85 0.87,0.75 1.62,2.19 1.62,4.44 0,3.21 -0.03,5.79 -0.03,6.6 0,0.63 0.45,1.38 1.65,1.14 A 24.039,24.039 0 0 0 49.7,27 C 49.7,13.74 38.96,3 25.7,3 Z"
+     id="path306"
+     style="stroke-width:3" />
+</svg>
diff --git a/static/instagram.svg b/static/icons/instagram.svg
similarity index 100%
rename from static/instagram.svg
rename to static/icons/instagram.svg
diff --git a/static/icons/rss.svg b/static/icons/rss.svg
new file mode 100644
index 0000000..1607495
--- /dev/null
+++ b/static/icons/rss.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--Generator: Apple Native CoreSVG 149-->
+
+<svg
+   version="1.1"
+   width="53"
+   height="53"
+   id="svg61"
+   sodipodi:docname="rss.svg"
+   inkscape:version="1.1.1 (c3084ef, 2021-09-22)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs65" />
+  <sodipodi:namedview
+     id="namedview63"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     width="50px"
+     inkscape:zoom="6.0121264"
+     inkscape:cx="57.96618"
+     inkscape:cy="32.184952"
+     inkscape:window-width="1312"
+     inkscape:window-height="969"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg61"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     units="px" />
+  <g
+     id="Regular-M"
+     transform="matrix(0.56964292,0,0,0.56964292,-4.5927378,49.221242)">
+    <path
+       d="m 19.4336,1.36719 q 2.832,0 4.8584,-2.02637 2.0264,-2.02637 2.0264,-4.8584 0,-2.88086 -2.002,-4.90722 -2.0019,-2.0264 -4.8828,-2.0264 -2.832,0 -4.9072,2.0752 -2.0752,2.07522 -2.0752,5.00491 0,2.68554 2.0996,4.71191 2.0996,2.02637 4.8828,2.02637 z m -6.25,-29.78519 q 0,1.6114 1.1719,2.7588 1.1718,1.1475 2.7832,1.1475 5.8105,0 10.6201,2.8808 4.8096,2.8809 7.6904,7.6905 2.8809,4.80954 2.8809,10.62009 0,1.61133 1.1474,2.783201 1.1475,1.171875 2.7588,1.171875 1.6114,0 2.7832,-1.171875 1.1719,-1.171871 1.1719,-2.783201 0,-6.00586 -2.2705,-11.27929 -2.2705,-5.2734 -6.2744,-9.2529 -4.0039,-3.9795 -9.2774,-6.25 -5.2734,-2.2705 -11.2304,-2.2705 -1.6114,0 -2.7832,1.1718 -1.1719,1.1719 -1.1719,2.7832 z m 0,-19.3847 q 0,1.6113 1.1719,2.7588 1.1718,1.1474 2.7832,1.1474 8.3984,0 15.747,3.1494 7.3487,3.1494 12.9395,8.7403 5.5908,5.5908 8.7402,12.9394 3.1494,7.3486 3.1494,15.74709 0,1.61133 1.1475,2.783201 1.1475,1.171875 2.7588,1.171875 1.6113,0 2.7832,-1.171875 1.1719,-1.171871 1.1719,-2.783201 0,-10.00979 -3.7842,-18.79879 -3.7842,-8.7891 -10.4492,-15.4297 -6.6651,-6.6407 -15.4297,-10.4248 -8.7647,-3.7842 -18.7744,-3.7842 -1.6114,0 -2.7832,1.1719 -1.1719,1.1718 -1.1719,2.7832 z m 0,-20.6543 q 0,1.6113 1.1719,2.7832 1.1718,1.1718 2.7832,1.1718 10.1074,0 19.2871,3.0762 9.1797,3.0762 16.8213,8.7158 7.6416,5.6397 13.2568,13.2813 5.6152,7.6416 8.7158,16.8213 3.1006,9.1797 3.1006,19.28709 0,1.61133 1.1719,2.783201 1.1719,1.171875 2.7832,1.171875 1.6113,0 2.7588,-1.171875 1.1474,-1.171871 1.1474,-2.783201 0,-11.42579 -3.4912,-21.75289 -3.4912,-10.3272 -9.8388,-18.9698 -6.3477,-8.6425 -14.9903,-14.9902 -8.6425,-6.3477 -18.9941,-9.8389 -10.3516,-3.4912 -21.7285,-3.4912 -1.6114,0 -2.7832,1.1475 -1.1719,1.1474 -1.1719,2.7588 z"
+       id="path58" />
+  </g>
+</svg>
diff --git a/static/icons/twitter.svg b/static/icons/twitter.svg
new file mode 100644
index 0000000..9a74043
--- /dev/null
+++ b/static/icons/twitter.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0.9 0.5 53.000002 53.000002"
+   version="1.1"
+   id="svg258"
+   sodipodi:docname="twitter.svg"
+   width="53"
+   height="53"
+   inkscape:version="1.1.1 (c3084ef, 2021-09-22)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs262" />
+  <sodipodi:namedview
+     id="namedview260"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     width="64px"
+     inkscape:zoom="7.4630677"
+     inkscape:cx="17.6201"
+     inkscape:cy="38.255046"
+     inkscape:window-width="1296"
+     inkscape:window-height="969"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg258" />
+  <g
+     id="g256"
+     transform="matrix(2.1139787,0,0,2.1139787,1.419202,6.1823306)">
+    <path
+       d="m 23.643,4.937 c -0.835,0.37 -1.732,0.62 -2.675,0.733 0.962,-0.576 1.7,-1.49 2.048,-2.578 -0.9,0.534 -1.897,0.922 -2.958,1.13 -0.85,-0.904 -2.06,-1.47 -3.4,-1.47 C 14.086,2.752 12,4.838 12,7.412 12,7.776 12.042,8.13 12.12,8.472 8.247,8.277 4.816,6.422 2.518,3.604 c -0.4,0.69 -0.63,1.49 -0.63,2.342 0,1.616 0.823,3.043 2.072,3.878 C 3.196,9.799 2.478,9.59 1.85,9.241 v 0.06 c 0,2.257 1.605,4.14 3.737,4.568 -0.392,0.106 -0.803,0.162 -1.227,0.162 -0.3,0 -0.593,-0.028 -0.877,-0.082 0.593,1.85 2.313,3.198 4.352,3.234 -1.595,1.25 -3.604,1.995 -5.786,1.995 -0.376,0 -0.747,-0.022 -1.112,-0.065 2.062,1.323 4.51,2.093 7.14,2.093 8.57,0 13.255,-7.098 13.255,-13.254 0,-0.2 -0.005,-0.402 -0.014,-0.602 0.91,-0.658 1.7,-1.477 2.323,-2.41 z"
+       id="path254" />
+  </g>
+</svg>
diff --git a/static/styles/main.css b/static/styles/main.css
index c0d6f66..a8b79a4 100644
--- a/static/styles/main.css
+++ b/static/styles/main.css
@@ -20,6 +20,8 @@
     --body-background-color: var(--light);
     --body-foreground-color: var(--dark);
 
+    --menu-icon-size: 20px;
+
     --link-color: var(--highlight-color);
 
     --tag-text-color: var(--dark);
@@ -153,6 +155,7 @@ p {
     padding: 0 0.5rem;
 }
 
+.formats menu,
 .menu menu,
 .social menu {
     display: inline-block;
@@ -162,25 +165,49 @@ p {
     text-transform: lowercase;
 }
 
+.formats menu li,
 .menu menu li,
 .social menu li {
     display: inline-block;
     letter-spacing: 2px;
 }
 
+.formats menu li + li:before,
 .menu menu li + li:before,
 .social menu li + li:before {
-    content: "•";
     font-size: 1.5rem;
     margin-right: 0.5rem;
 }
 
+.formats menu li + li:before,
+.menu menu li + li:before {
+    content: "•";
+}
+
+.social menu li + li {
+    margin-left: 1rem;
+}
+
+.formats,
 .social {
     display: flex;
     letter-spacing: 2px;
     margin-left: auto;
 }
 
+.social a {
+    background-image: var(--url);
+    background-repeat: no-repeat;
+    background-size: var(--menu-icon-size);
+    display: block;
+    height: var(--menu-icon-size);
+    width: var(--menu-icon-size);
+}
+
+.social a span {
+    display: none;
+}
+
 .social > li + li:before {
     color: var(--dark);
     padding: 0 0.5rem;
@@ -216,6 +243,11 @@ p {
  * Main
  */
 
+.main > header {
+    align-items: baseline;
+    display: flex;
+}
+
 .main {
     margin: 3.5rem 0;
 }
diff --git a/static/twitter.svg b/static/twitter.svg
deleted file mode 100644
index 32e59fa..0000000
--- a/static/twitter.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0.9 0.5 22.8 22.8" xmlns="http://www.w3.org/2000/svg"><g><path d="M23.643 4.937c-.835.37-1.732.62-2.675.733.962-.576 1.7-1.49 2.048-2.578-.9.534-1.897.922-2.958 1.13-.85-.904-2.06-1.47-3.4-1.47-2.572 0-4.658 2.086-4.658 4.66 0 .364.042.718.12 1.06-3.873-.195-7.304-2.05-9.602-4.868-.4.69-.63 1.49-.63 2.342 0 1.616.823 3.043 2.072 3.878-.764-.025-1.482-.234-2.11-.583v.06c0 2.257 1.605 4.14 3.737 4.568-.392.106-.803.162-1.227.162-.3 0-.593-.028-.877-.082.593 1.85 2.313 3.198 4.352 3.234-1.595 1.25-3.604 1.995-5.786 1.995-.376 0-.747-.022-1.112-.065 2.062 1.323 4.51 2.093 7.14 2.093 8.57 0 13.255-7.098 13.255-13.254 0-.2-.005-.402-.014-.602.91-.658 1.7-1.477 2.323-2.41z" /></g></svg>