From 5c307e15cae258cce5d271c46d5d64b8ea26dae0 Mon Sep 17 00:00:00 2001 From: amzrk2 Date: Tue, 22 Dec 2020 12:40:39 +0800 Subject: fix: #61, `showToc` not work as expected --- layouts/partials/sidebar.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index 6847375..1d6ae92 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -33,13 +33,15 @@ </div> </div> <!-- in-post toc --> - {{ if .IsPage }} - {{ if and (ne .Site.Params.showToc false) (ne .Params.showToc false) }} + {{- if .IsPage -}} + {{- $pageShowToc := .Params.showToc -}} + {{- $siteShowToc := .Site.Params.showToc -}} + {{- if or ($pageShowToc) (and (ne $pageShowToc false) (ne $siteShowToc false)) -}} <div class="sidebar-item sidebar-toc"> <h3>{{ i18n "sidebarToc" }}</h3> - {{ .TableOfContents }} + {{- .TableOfContents -}} </div> - {{ end }} + {{- end -}} {{ else }} {{ with .Site.Params.bgmImageChart }} <!-- bgm.tv image chart --> -- cgit v1.2.3