From 49e64c95914b61da4be00f54aefbaa93bb5253ec Mon Sep 17 00:00:00 2001
From: edisonxiang <xiang.edison@gmail.com>
Date: Tue, 10 Sep 2019 10:31:32 +0800
Subject: [PATCH] fix news&events focus

---
 themes/project/layouts/partials/nav.html | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/themes/project/layouts/partials/nav.html b/themes/project/layouts/partials/nav.html
index 522912e..c5e691b 100644
--- a/themes/project/layouts/partials/nav.html
+++ b/themes/project/layouts/partials/nav.html
@@ -22,15 +22,13 @@
                   {{ $current := . }}
                   {{ range .Site.Menus.main }}
                   {{ $topLevel := replace .URL "/" "" }}
-                  <div style="display: none">
-                    RelPermalink: {{ $current.RelPermalink }}<br>
-                    URL: {{ .URL }}<br>
-                    current.Type: {{ $current.Type }}<br>
-                    topLevel: {{ $topLevel }}<br>
-                    Identifier: {{ .Identifier }}<br>
-                    Kind: {{ $current.Kind }} <br>
-                  </div>
-                  <li class="dropdown{{ if eq $current.RelPermalink .URL | or (eq (trim $current.RelPermalink "/") $topLevel) | or (eq $current.Type .Identifier) | or (eq $current.Type $topLevel) | or (and (eq (default (trim .URL "/") .Identifier) "blog") (in (slice "taxonomy" "taxonomyTerm") $current.Kind)) }} active{{ end }}">
+                  {{ $isChildren := false }}
+                  {{ range .Children }}
+                  {{ if eq .Identifier $current.Type }}
+                    {{ $isChildren = true }}
+                  {{ end }}
+                  {{ end }}
+                  <li class="dropdown{{ if eq $current.RelPermalink .URL | or $isChildren | or (eq (trim $current.RelPermalink "/") $topLevel) | or (eq $current.Type .Identifier) | or (eq $current.Type $topLevel) | or (and (eq (default (trim .URL "/") .Identifier) "blog") (in (slice "taxonomy" "taxonomyTerm") $current.Kind)) }} active{{ end }}">
                     {{ if .HasChildren }}
                       <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ .Name }} <span class="caret"></span></a>
                     <ul class="dropdown-menu">
-- 
GitLab