src/_data/meta.js

@@ -7,8 +7,4 @@ export default {
   lang: "en",
   author: "Devin Haska",
   repoUrl: "https://github.com/wonderfulfrog/wonderfulfrog.com",
-  social: {
-    github: "https://github.com/wonderfulfrog",
-    mastodon: "https://mastodon.social/@wonderfulfrog",
-  },
 };

src/_data/navigation.js

@@ -27,15 +27,15 @@ export default {
     },
   ],
   bottom: [
-    {
-      text: "Contact",
-      url: "/contact",
-    },
+    { text: "Blogroll", url: "/blogroll" },
     {
       text: "Colophon",
       url: "/colophon",
     },
-    { text: "Blogroll", url: "/blogroll" },
+    {
+      text: "Contact",
+      url: "/contact",
+    },
     {
       text: "/uses",
       url: "/uses",

src/_includes/partials/footer.html

@@ -16,28 +16,35 @@
             <nav class="flow-space-0.5">
                 <ul class="cluster p-0 m-0 gap-0.5" role="list">
                     <li>
-                        <span class="visually-hidden">Feeds</span>
-                        <a href="/feeds" class="button button--alt" aria-label="View RSS feed">{% include "svgs/rss.svg" %}</a>
+                        <a href="/feeds"
+                           class="button button--alt"
+                           aria-label="Feeds"
+                           title="Feeds">{% include "svgs/rss.svg" %}</a>
                     </li>
-                    {% for key, url in meta.social %}
-                        {% set alt = key | capitalize %}
                     <li>
-                            <span class="visually-hidden">{{ alt }}</span>
-                            <a href="{{ url }}"
+                        <a href="https://github.com/wonderfulfrog"
                            class="button button--alt"
                            target="_blank"
                            rel="me external noreferrer noopener"
-                               aria-label="View {{ alt }} page">{% include "svgs/social-" + key + ".svg" %}</a>
+                           title="GitHub"
+                           aria-label="GitHub">{% include "svgs/social-github.svg" %}</a>
+                    </li>
+                    <li>
+                        <a href="https://mastodon.social/@wonderfulfrog"
+                           class="button button--alt"
+                           target="_blank"
+                           rel="me external noreferrer noopener"
+                           title="Mastodon"
+                           aria-label="Mastodon">{% include "svgs/social-mastodon.svg" %}</a>
                     </li>
-                    {% endfor %}
                 </ul>
             </nav>
             <ul class="cluster p-0 m-0" role="list">
                 <li>
-                    <a href="/webrings">Webrings</a>
+                    <a href="/changelog">Changelog</a>
                 </li>
                 <li>
-                    <a href="/changelog">Changelog</a>
+                    <a href="/webrings">Webrings</a>
                 </li>
                 <li>
                     <a href="{{ meta.repoUrl }}"

src/_includes/partials/menu.html

@@ -2,9 +2,9 @@
     {% for item in navigation.top %}
         <li>
             <a class="button button--alt font-size-s line-height-m"
-               href="{{ item.url }}">
-                {% include "svgs/" + item.icon + ".svg" %}
-                <span class="visually-hidden">{{ item.text }}</span></a>
+               href="{{ item.url }}"
+               title="{{ item.text }}"
+               aria-label="{{ item.text }}">{% include "svgs/" + item.icon + ".svg" %}</a>
         </li>
     {% endfor %}
 </ul>

src/_includes/svgs/social-lastfm.svg

@@ -1,3 +0,0 @@
-<svg fill="currentColor" width="16" height="16" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
-  <path d="M14.131 22.948l-1.172-3.193c0 0-1.912 2.131-4.771 2.131-2.537 0-4.333-2.203-4.333-5.729 0-4.511 2.276-6.125 4.515-6.125 3.224 0 4.245 2.089 5.125 4.772l1.161 3.667c1.161 3.561 3.365 6.421 9.713 6.421 4.548 0 7.631-1.391 7.631-5.068 0-2.968-1.697-4.511-4.844-5.244l-2.344-0.511c-1.624-0.371-2.104-1.032-2.104-2.131 0-1.249 0.985-1.984 2.604-1.984 1.767 0 2.704 0.661 2.865 2.24l3.661-0.444c-0.297-3.301-2.584-4.656-6.323-4.656-3.308 0-6.532 1.251-6.532 5.245 0 2.5 1.204 4.077 4.245 4.807l2.484 0.589c1.865 0.443 2.484 1.224 2.484 2.287 0 1.359-1.323 1.921-3.828 1.921-3.703 0-5.244-1.943-6.124-4.625l-1.204-3.667c-1.541-4.765-4.005-6.531-8.891-6.531-5.287-0.016-8.151 3.385-8.151 9.192 0 5.573 2.864 8.595 8.005 8.595 4.14 0 6.125-1.943 6.125-1.943z"/>
-</svg>