From e445988e31ace43f9e1174b220bdf98ec0e3d917 Mon Sep 17 00:00:00 2001
From: Alexander Bilz <mail@alexbilz.com>
Date: Sun, 24 May 2020 09:27:06 +0000
Subject: [PATCH] Merge pull request #23 from lxndrblz/buggy-menu

---
 layouts/partials/navbar.html |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
index dcdc0dc..db8ce50 100644
--- a/layouts/partials/navbar.html
+++ b/layouts/partials/navbar.html
@@ -1,12 +1,11 @@
 <div class="page-top animated fadeInDown">
-    <!-- <div class="nav"> -->
-        <ul class="nav">
-        {{ $currentPage := . }}
+    <ul class="nav">
+        {{ $url := .RelPermalink }}
         {{ range .Site.Menus.main }}
-        <li><a {{if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) }}class="current"{{end}} href="{{ .URL }}" title="{{ .Title }}">{{ .Name }}</a></li>
+        {{ $active := eq $url .URL }}
+        <li><a {{if $active }}class="current"{{end}} href="{{ .URL }}" title="{{ .Title }}">{{ .Name }}</a></li>
         {{ end }}
-        </ul>
-    <!-- </div> -->
+    </ul>
     <div class="themeswitcher">
         <a class="theme-switch" title="Switch Theme">
             <i class="fa fa-adjust fa-fw" aria-hidden="true"></i>

--
Gitblit v1.10.0