From 26788bbd9a3928a1e4956e1a9e61e378c0d252db Mon Sep 17 00:00:00 2001
From: Cory Dransfeldt <cory.dransfeldt@gmail.com>
Date: Tue, 12 Dec 2023 21:08:15 -0800
Subject: [PATCH] fix: nav active states

---
 src/_includes/partials/nav/link.liquid | 19 +++++++++----------
 src/assets/styles/tailwind.css         |  2 +-
 tailwind.css                           |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/_includes/partials/nav/link.liquid b/src/_includes/partials/nav/link.liquid
index 9c119d83..4b7f546c 100644
--- a/src/_includes/partials/nav/link.liquid
+++ b/src/_includes/partials/nav/link.liquid
@@ -1,14 +1,5 @@
 {%- capture pageUrl %}/{{ link | downcase }}/{% endcapture -%}
-{% if page.url != pageUrl %}
-  <a class="text-gray-700 hover:text-blue-800 dark:text-white dark:hover:text-blue-200 !no-underline" href="/{{ link | downcase }}">
-    {% if icon %}
-      {% tablericon icon link %}
-    {% else %}
-      {{ link }}
-    {% endif %}
-  </a>
-{% endif %}
-{% if page.url == pageUrl %}
+{% if pageUrl contains page.fileSlug and page.fileSlug %}
   <span class="cursor-not-allowed active">
     {% if icon %}
       {% tablericon icon link %}
@@ -16,4 +7,12 @@
       {{ link }}
     {% endif %}
   </span>
+{% else %}
+  <a class="text-gray-700 hover:text-blue-800 dark:text-white dark:hover:text-blue-200 !no-underline" href="/{{ link | downcase }}">
+    {% if icon %}
+      {% tablericon icon link %}
+    {% else %}
+      {{ link }}
+    {% endif %}
+  </a>
 {% endif %}
\ No newline at end of file
diff --git a/src/assets/styles/tailwind.css b/src/assets/styles/tailwind.css
index 78b0d7ba..073db387 100644
--- a/src/assets/styles/tailwind.css
+++ b/src/assets/styles/tailwind.css
@@ -1960,7 +1960,7 @@ html {
 
 .active,
 .active svg {
-  color: #2563eb !important;
+  color: #2563eb;
 }
 
 .header-anchor {
diff --git a/tailwind.css b/tailwind.css
index 40974f32..1f17da7d 100644
--- a/tailwind.css
+++ b/tailwind.css
@@ -50,7 +50,7 @@ html {
 
 .active,
 .active svg {
-  color: theme(colors.blue.600) !important;
+  color: theme(colors.blue.600);
 }
 
 .header-anchor {