fix(style): fix active header menu item

pogor-dev · Feb 20, 2020 · f3eb6fc · f3eb6fc
1 parent 20c9c81
commit f3eb6fc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/assets/css/_variables.scss b/assets/css/_variables.scss
@@ -51,7 +51,7 @@ $header-height-desktop: 4rem !default;
 $header-height-mobile: 4rem !default;
 
 // Color of the header background
-$header-background-color: #fafafa !default;
+$header-background-color: #f8f8f8 !default;
 $header-background-color-dark: #252627 !default;
 
 // Color of the hover header item

diff --git a/exampleSite/config.toml b/exampleSite/config.toml
@@ -37,22 +37,22 @@ themesDir = "../.."
       [[languages.en.menu.main]]
         identifier = "posts"
         name = "Posts"
-        url = "posts"
+        url = "/posts/"
         weight = 1
       [[languages.en.menu.main]]
         identifier = "tags"
         name = "Tags"
-        url = "tags"
+        url = "/tags/"
         weight = 2
       [[languages.en.menu.main]]
         identifier = "categories"
         name = "Categories"
-        url = "categories"
+        url = "/categories/"
         weight = 3
       [[languages.en.menu.main]]
         identifier = "about"
         name = "About"
-        url = "about"
+        url = "/about/"
         weight = 4
       [[languages.en.menu.main]]
         identifier = "zh"
@@ -332,22 +332,22 @@ themesDir = "../.."
       [[languages.zh.menu.main]]
         identifier = "posts"
         name = "文章"
-        url = "posts"
+        url = "/posts/"
         weight = 1
       [[languages.zh.menu.main]]
         identifier = "tags"
         name = "标签"
-        url = "tags"
+        url = "/tags/"
         weight = 2
       [[languages.zh.menu.main]]
         identifier = "categories"
         name = "分类"
-        url = "categories"
+        url = "/categories/"
         weight = 3
       [[languages.zh.menu.main]]
         identifier = "about"
         name = "关于"
-        url = "about"
+        url = "/about/"
         weight = 4
       [[languages.zh.menu.main]]
         identifier = "en"

diff --git a/layouts/partials/header.html b/layouts/partials/header.html
@@ -7,9 +7,8 @@
             </a>
         </div>
         <div class="menu">
-            {{- $currentPage := . }}
             {{- range .Site.Menus.main -}}
-                <a class="menu-item{{ if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) | or (eq $currentPage.RelPermalink .URL) }} active{{ end }}" href="{{ .URL | relLangURL }}" title="{{ .Title }}">
+                <a class="menu-item{{ if $.IsMenuCurrent "main" . | or ($.HasMenuCurrent "main" .) | or (.URL | relLangURL | string | eq $.RelPermalink ) }} active{{ end }}" href="{{ .URL | relLangURL }}"{{ with .Title }} title="{{ . }}"{{ end }}>
                     {{- .Pre | safeHTML }}{{ .Name -}}
                 </a>
             {{- end -}}

diff --git a/resources/_gen/assets/scss/css/style.template.scss_b8ba9a60a151126bfcde1421dc0b972d.content b/resources/_gen/assets/scss/css/style.template.scss_b8ba9a60a151126bfcde1421dc0b972d.content