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

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "coryd.dev",
-  "version": "1.3.20",
+  "version": "1.4.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "coryd.dev",
-      "version": "1.3.20",
+      "version": "1.4.0",
       "license": "MIT",
       "dependencies": {
         "minisearch": "^7.1.2",
@@ -19,7 +19,7 @@
         "cssnano": "^7.0.6",
         "dotenv": "16.5.0",
         "ics": "^3.8.1",
-        "jsdom": "26.0.0",
+        "jsdom": "26.1.0",
         "markdown-it": "^14.1.0",
         "markdown-it-anchor": "^9.2.0",
         "markdown-it-footnote": "^4.0.0",
@@ -859,13 +859,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -1056,20 +1049,6 @@
         "keyv": "^5.3.2"
       }
     },
-    "node_modules/call-bind-apply-helpers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
-      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/caniuse-api": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
@@ -1341,19 +1320,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/commander": {
       "version": "10.0.1",
       "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
@@ -1683,16 +1649,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/depd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@@ -1795,21 +1751,6 @@
         "url": "https://dotenvx.com"
       }
     },
-    "node_modules/dunder-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
-      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind-apply-helpers": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.2.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/eastasianwidth": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
@@ -1874,55 +1815,6 @@
         "errno": "cli.js"
       }
     },
-    "node_modules/es-define-property": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
-      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-errors": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-object-atoms": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
-      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-set-tostringtag": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
-      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.6",
-        "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/escalade": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
@@ -2146,22 +2038,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/form-data": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
-      "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "es-set-tostringtag": "^2.1.0",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/fresh": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz",
@@ -2197,45 +2073,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/get-intrinsic": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
-      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind-apply-helpers": "^1.0.2",
-        "es-define-property": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.1.1",
-        "function-bind": "^1.1.2",
-        "get-proto": "^1.0.1",
-        "gopd": "^1.2.0",
-        "has-symbols": "^1.1.0",
-        "hasown": "^2.0.2",
-        "math-intrinsics": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
-      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "dunder-proto": "^1.0.1",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/glob": {
       "version": "11.0.1",
       "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.1.tgz",
@@ -2299,19 +2136,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/gopd": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
-      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
@@ -2359,35 +2183,6 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/has-symbols": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
-      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
-      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-symbols": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/hasown": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
@@ -2742,16 +2537,15 @@
       }
     },
     "node_modules/jsdom": {
-      "version": "26.0.0",
+      "version": "26.1.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.1.0.tgz",
-      "integrity": "sha512-BZYDGVAIriBWTpIxYzrXjv3E/4u8+/pSG5bQdIYCbNCGOvsPkDQfTVLAIXAf9ETdCpduCVTkDe2NNZ8NIwUVzw==",
+      "integrity": "sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "cssstyle": "^4.2.1",
         "data-urls": "^5.0.0",
-        "decimal.js": "^10.4.3",
+        "decimal.js": "^10.5.0",
-        "form-data": "^4.0.1",
         "html-encoding-sniffer": "^4.0.0",
         "http-proxy-agent": "^7.0.2",
         "https-proxy-agent": "^7.0.6",
@@ -2761,12 +2555,12 @@
         "rrweb-cssom": "^0.8.0",
         "saxes": "^6.0.0",
         "symbol-tree": "^3.2.4",
-        "tough-cookie": "^5.0.0",
+        "tough-cookie": "^5.1.1",
         "w3c-xmlserializer": "^5.0.0",
         "webidl-conversions": "^7.0.0",
         "whatwg-encoding": "^3.1.1",
         "whatwg-mimetype": "^4.0.0",
-        "whatwg-url": "^14.1.0",
+        "whatwg-url": "^14.1.1",
         "ws": "^8.18.0",
         "xml-name-validator": "^5.0.0"
       },
@@ -2973,16 +2767,6 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "node_modules/math-intrinsics": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
-      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/maximatch": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/maximatch/-/maximatch-0.1.0.tgz",
@@ -3051,9 +2835,9 @@
       }
     },
     "node_modules/mime-db": {
-      "version": "1.52.0",
+      "version": "1.54.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3061,13 +2845,13 @@
       }
     },
     "node_modules/mime-types": {
-      "version": "2.1.35",
+      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "mime-db": "1.52.0"
+        "mime-db": "^1.54.0"
       },
       "engines": {
         "node": ">= 0.6"
@@ -4375,29 +4159,6 @@
         "node": ">= 18"
       }
     },
-    "node_modules/send/node_modules/mime-db": {
-      "version": "1.54.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
-      "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/send/node_modules/mime-types": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz",
-      "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "mime-db": "^1.54.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coryd.dev",
-  "version": "1.3.20",
+  "version": "1.4.0",
   "description": "The source for my personal site. Built using 11ty (and other tools).",
   "type": "module",
   "engines": {
@@ -40,7 +40,7 @@
     "cssnano": "^7.0.6",
     "dotenv": "16.5.0",
     "ics": "^3.8.1",
-    "jsdom": "26.0.0",
+    "jsdom": "26.1.0",
     "markdown-it": "^14.1.0",
     "markdown-it-anchor": "^9.2.0",
     "markdown-it-footnote": "^4.0.0",

queries/views/globals/nav.psql

@@ -4,6 +4,7 @@ SELECT
   n.menu_location,
   n.permalink,
   n.icon,
+  n.section,
   n.title,
   n.sort,
   p.title AS page_title,

src/assets/styles/base/index.css

@@ -341,6 +341,7 @@ hr {
 time {
   color: var(--gray-dark);
   font-size: var(--font-size-sm);
+  line-height: var(--sizing-sm);
 }
 
 article {
@@ -458,10 +459,11 @@ td:first-of-type,
   display: flex;
   flex-direction: column;
   gap: var(--spacing-base);
+  align-items: start;
   width: var(--sizing-full);
   padding-top: var(--spacing-3xl);
 
-  @media screen and (min-width: 768px) {
+  @media screen and (min-width: 360px) {
     flex-direction: row;
     align-items: center;
     justify-content: space-between;
@@ -486,7 +488,7 @@ td:first-of-type,
 
 /* layout */
 .default-wrapper {
-  padding-top: var(--spacing-2xl);
+  padding-top: var(--spacing-base);
 }
 
 .main-wrapper {

src/assets/styles/base/vars.css

@@ -45,7 +45,7 @@
   --brand-mastodon: light-dark(#563acc, #858afa);
   --brand-npm: #cb3837;
   --brand-rss: light-dark(#c24f19, #f26522);
-  --brand-stalwart: light-dark(#db2c53, #d999a7);
+  --brand-stalwart: light-dark(#db2c53, #ff4c6a);
 
   --article: light-dark(#007272, #00ffff);
   --about: light-dark(#e4513a, #ff967d);

src/assets/styles/components/nav.css

@@ -0,0 +1,51 @@
+nav {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  gap: var(--spacing-md);
+  padding: 0;
+  margin: 0;
+
+  .icon > span,
+  .active > span {
+    display: none;
+  }
+
+  &.primary {
+    margin-top: var(--spacing-base);
+  }
+
+  &.icons {
+    justify-content: end;
+  }
+
+  &.primary,
+  &.sub-pages {
+    gap: var(--sizing-sm);
+  }
+
+  &.social,
+  &.sub-pages {
+    align-items: center;
+    justify-content: center;
+  }
+
+  &.icons,
+  &.social {
+    gap: var(--spacing-md);
+  }
+
+  &.social {
+    margin-bottom: var(--spacing-lg);
+  }
+
+  &.primary,
+  &.social {
+    width: var(--sizing-full);
+  }
+
+  &.sub-pages {
+    font-size: var(--font-size-sm);
+    padding-bottom: var(--spacing-3xl);
+  }
+}

src/assets/styles/components/nav/footer.css

@@ -1,31 +0,0 @@
-nav {
-  &.social,
-  &.sub-pages {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: wrap;
-    align-items: center;
-    justify-content: center;
-  }
-
-  &.social {
-    gap: var(--spacing-md);
-    margin-bottom: var(--spacing-lg);
-    width: var(--sizing-full);
-
-    .icon > span,
-    .active > span {
-      display: none;
-    }
-
-    .active {
-      display: flex;
-    }
-  }
-
-  &.sub-pages {
-    font-size: var(--font-size-sm);
-    padding-bottom: var(--spacing-3xl);
-    gap: var(--sizing-sm);
-  }
-}

src/assets/styles/components/nav/primary.css

@@ -1,25 +0,0 @@
-.nav-list {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-  list-style: none;
-  gap: var(--spacing-md);
-  padding: 0;
-  margin: 0;
-
-  @media screen and (min-width: 768px) {
-    justify-content: center;
-  }
-
-  & > li {
-    margin-bottom: 0;
-
-    :is(.icon, .active) svg {
-      display: block;
-    }
-
-    :is(.icon, .active) span {
-      display: none;
-    }
-  }
-}

src/assets/styles/index.css

@@ -28,8 +28,7 @@
 @import url("./components/buttons.css") layer(components);
 @import url("./components/forms.css") layer(components);
 @import url("./components/media-grid.css") layer(components);
-@import url("./components/nav/primary.css") layer(components);
+@import url("./components/nav.css") layer(components);
-@import url("./components/nav/footer.css") layer(components);
 @import url("./components/modal.css") layer(components);
 @import url("./components/music-chart.css") layer(components);
 @import url("./components/paginator.css") layer(components);

src/data/nav.js

@@ -24,6 +24,7 @@ const fetchAllNavigation = async () => {
         title: item.title || item.page_title,
         permalink: item.permalink || item.page_permalink,
         icon: item.icon,
+        section: item.section,
         sort: item.sort,
       };
 

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

@@ -6,8 +6,15 @@
       <a href="/" tabindex="0">{{ globals.site_name }}</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"
+  separator:true
+%}

src/includes/nav/link.liquid

@@ -14,7 +14,7 @@
   </span>
 {%- else -%}
   <a
-    class="{% if link.icon %}{{ link.icon | downcase }} icon {% endif %}{{ link.class }}"
+    class="{% if link.section %}{{ link.section | downcase }} {% endif %}{% if link.icon %}{{ link.icon | downcase }} icon {% endif %}{{ link.class }}"
     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>