Merge pull request #760 from gethinode/develop

Fix sidebar rendering

layouts/_default/single.html

@@ -3,8 +3,18 @@
     {{ $sidebar := .Render "single/sidebar" }}
     {{ $toc := .Render "single/panel-toc" }}
 
-    {{ $sidebar | safeHTML }}
-
+    {{ with $sidebar }}
+        <div class="offcanvas offcanvas-start" tabindex="-1" id="offcanvass-sidebar" aria-inledby="offcanvas-label">
+            <div class="offcanvas-header">
+                <h5 class="offcanvas-title" id="offcanvas-label">{{ strings.FirstUpper $.Section }}</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="{{ T "close" }}"></button>
+            </div>
+            <div class="offcanvas-body">
+                {{ . | safeHTML }}
+            </div>
+        </div>
+    {{ end }}
+
     <div class="container-xxl flex-fill p-4 px-xxl-0">
         {{ if $sidebar -}}
             <div class="row row-cols-1 row-cols-{{ $breakpoint.current }}-2 row-cols-{{ $breakpoint.next }}-3">

layouts/_default/single/sidebar.html

@@ -2,18 +2,6 @@
 {{- $version := .Scratch.Get "version" -}}
 {{ $sidebar := "" }}
 {{- $hasSidebar := .Site.Params.navigation.sidebar | default true -}}
-{{ if and $menu $hasSidebar  }}{{ $sidebar = partial "assets/sidebar.html" (dict "page" . "menu" $menu "version" $version) }}{{ end }}
-
-{{ if $sidebar -}}
-    <div class="offcanvas offcanvas-start" tabindex="-1" id="offcanvass-sidebar" aria-inledby="offcanvas-label">
-        <div class="offcanvas-header">
-            <h5 class="offcanvas-title" id="offcanvas-label">{{ strings.FirstUpper $.Section }}</h5>
-            <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="{{ T "close" }}"></button>
-        </div>
-        <div class="offcanvas-body">
-            {{ $sidebar | safeHTML }}
-        </div>
-    </div>
-{{ else if .Site.Params.navigation.sidebar }}
-    &nbsp;
+{{ if and $menu $hasSidebar  }}
+    {{ partial "assets/sidebar.html" (dict "page" . "menu" $menu "version" $version) }}
 {{ end }}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.23.0-beta2",
+  "version": "0.23.0-beta3",
   "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
   "keywords": [
     "hugo",