feat(nav): refactor primary navigation to split labels + icons; remove redundant nav code

src/includes/home/recent-activity.liquid

@@ -3,12 +3,6 @@
     {% tablericon "activity" %}
     Recent activity
   </h2>
-  <p>
-    <a href="/posts" class="article">Posts</a> •
-    <a href="/links" class="link">Links</a> •
-    <a href="/watching" class="movies">Watching</a> •
-    <a href="/books" class="books">Books</a>
-  </p>
     {%- for item in items -%}
     <article class="{{ item.type }}">
       <aside>

src/includes/layout/footer.liquid

@@ -8,12 +8,15 @@
   {%- if updateTime -%}
     <p class="updated"><em>This page was last updated on {{ updateTime | strip }}.</em></p>
   {%- endif -%}
-  {% render "nav/social.liquid",
+  {% render "nav/menu.liquid",
     page:page,
-    links:nav.footer_icons
+    nav:nav.footer_icons
+    class:"social"
   %}
-  {% render "nav/secondary.liquid",
+  {% render "nav/menu.liquid",
     page:page,
-    links:nav.footer_text
+    nav:nav.footer_text
+    class:"sub-pages"
+    separator:true
   %}
 </footer>

src/includes/layout/header.liquid

@@ -1,13 +1,23 @@
+{%- capture headerContent -%}
+  <img class="icon" src="{{ globals.cdn_url }}{{ globals.avatar_header }}?class=w200&v={% appVersion %}" alt"{{ globals.site_name }}" />
+  <span>Cory</span> <span>Dransfeldt</span>
+{%- endcapture -%}
 <section class="main-title">
   <h1>
     {%- if page.url == "/" -%}
-      {{ globals.site_name }}
+      {{ headerContent }}
     {%- else -%}
-      <a href="/" tabindex="0">{{ globals.site_name }}</a>
+      <a href="/" tabindex="0">{{ headerContent }}</a>
     {%- endif -%}
   </h1>
-  {% render "nav/primary.liquid",
+  {% render "nav/menu.liquid",
     page:page,
-    nav:nav
+    nav:nav.primary_icons
+    class:"icons"
   %}
 </section>
+{% render "nav/menu.liquid",
+  page:page,
+  nav:nav.primary
+  class:"primary"
+%}

src/includes/nav/link.liquid

@@ -1,8 +1,12 @@
 {%- assign categoryUrl = link.permalink | downcase -%}
 {%- assign isHttp = categoryUrl contains "http" -%}
 {%- if categoryUrl | isLinkActive:page.url -%}
+{%- capture linkClass -%}
+  {%- if link.section -%}button{%- endif -%}
+  {%- if link.icon -%}icon{%- endif -%}
+{%- endcapture -%}
   <span
-    class="active {{ link.class }}"
+    class="active {{ linkClass }}"
     aria-current="page"
   >
     {%- if link.icon -%}
@@ -14,7 +18,7 @@
   </span>
 {%- else -%}
   <a
-    class="{% if link.icon %}{{ link.icon | downcase }} icon {% endif %}{{ link.class }}"
+    class="{% if link.section %}{{ link.section | downcase }} button {% endif %}{% if link.icon %}{{ link.icon | downcase }} icon {% endif %}"
     href="{{ categoryUrl }}"
     {% if isHttp -%} rel="me" {%- endif %}
     title="{{ link.title }}"

src/includes/nav/menu.liquid

@@ -0,0 +1,11 @@
+<nav class="{{ class }}">
+  {%- for link in nav -%}
+    {% render "nav/link.liquid",
+      page:page,
+      link:link
+    %}
+    {%- if separator -%}
+      {% unless forloop.last %}<span>•</span>{% endunless %}
+    {%- endif -%}
+  {%- endfor -%}
+</nav>

src/includes/nav/primary.liquid

@@ -1,12 +0,0 @@
-<nav class="primary-navigation">
-  <ul class="nav-list">
-    {%- for link in nav.primary -%}
-      <li>
-        {% render "nav/link.liquid",
-          page:page,
-          link:link
-        %}
-      </li>
-    {%- endfor -%}
-  </ul>
-</nav>

src/includes/nav/secondary.liquid

@@ -1,9 +0,0 @@
-<nav aria-label="Secondary site navigation" class="sub-pages">
-  {%- for link in links -%}
-    {% render "nav/link.liquid",
-      page:page,
-      link:link
-    %}
-    {% unless forloop.last %}<span>•</span>{% endunless %}
-  {%- endfor -%}
-</nav>

src/includes/nav/social.liquid

@@ -1,8 +0,0 @@
-<nav aria-label="Social icons" class="social">
-  {%- for link in links -%}
-    {% render "nav/link.liquid",
-      page:page,
-      link:link
-    %}
-  {%- endfor -%}
-</nav>