From e5df2f022d57ace4d4bb94c0c57227e9c8fe2b56 Mon Sep 17 00:00:00 2001
From: li-kai <falconets25601@hotmail.com>
Date: Sat, 1 Jul 2017 18:22:58 +0800
Subject: [PATCH] Add navigation highlighting

---
 layouts/partials/header.html | 4 ++--
 static/scss/header.scss      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 1120f1eb..f6bb2576 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -4,9 +4,9 @@ <h1 class="banner-text"><a href="/" title="NUS Hackers" rel="home" class="banner
   </div>
   <nav class="nav col-12 col-sm-8 col-lg-6 offset-lg-2">
     <ul class="nav-menu">
-      {{ $currentPage := . }}
+      {{ $currentURL := .URL }}
       {{ range .Site.Menus.main }}
-      <li class="nav-menu-item"><a class="nav-menu-link{{ if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) }} nav-menu-active{{ end }}" href="{{ .URL }}">{{ .Name }}</a></li>
+      <li class="nav-menu-item{{ if in $currentURL .URL}} nav-menu-active{{ end }}"><a class="nav-menu-link" href="{{ .URL }}">{{ .Name }}</a></li>
       {{ end }}
     </ul>
   </nav>
diff --git a/static/scss/header.scss b/static/scss/header.scss
index bd8a4853..f454f657 100644
--- a/static/scss/header.scss
+++ b/static/scss/header.scss
@@ -45,10 +45,10 @@
     text-decoration: none;
     color: black;
   }
-  .nav-menu-item:hover {
+  .nav-menu-active, .nav-menu-item:hover {
     background: $highlight-orange;
   }
-  .nav-menu-item:hover .nav-menu-link {
+  .nav-menu-active .nav-menu-link, .nav-menu-item:hover .nav-menu-link {
     text-decoration: none;
     color: white;
   }