From efa9d7061ff17a31310615e99a12606469738ef3 Mon Sep 17 00:00:00 2001
From: Luke Fretwell <luke@lukefretwell.com>
Date: Thu, 22 Oct 2026 19:06:08 -0700
Subject: [PATCH] Mark the current nav item active by path instead of substring

---
 _includes/nav.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/_includes/nav.html b/_includes/nav.html
index 73b68c61..e0444819 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -67,8 +67,10 @@
       <ul class="navbar-nav mb-2 mb-lg-0">
         {% for item in nav %}
           {% if item.url %}
+            {# Current page, or anything under the item's URL; "/" matches only the home page #}
+            {% set isActive = page.url == item.url or (item.url != '/' and page.url.indexOf(item.url) == 0 and (item.url.slice(-1) == '/' or page.url.charAt(item.url.length) == '/')) %}
             <li class="nav-item me-3 me-lg-0 small">
-              <a class="nav-link mx-1{% if item.url in page.url %} active{% endif %}" {% if item.url in page.url %}aria-current="page"{% endif %} href="{{ item.url }}">
+              <a class="nav-link mx-1{% if isActive %} active{% endif %}" {% if isActive %}aria-current="page"{% endif %} href="{{ item.url }}">
                 <i class="{{ item.icon }} me-2"></i>
                 {{ item.title }}
               </a>