From 9868b04fae0366cd776b927622e352e62eefed5e Mon Sep 17 00:00:00 2001
From: Geo <gcushen@users.noreply.github.com>
Date: Mon, 16 May 2022 11:40:29 +0100
Subject: [PATCH] fix: case with book at site root

---
 .github/workflows/build-test-site.yaml           | 2 +-
 wowchemy/assets/scss/wowchemy/layouts/_book.scss | 5 +++++
 wowchemy/layouts/partials/book_sidebar.html      | 9 +++++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-test-site.yaml b/.github/workflows/build-test-site.yaml
index 494e120f..f895d88d 100644
--- a/.github/workflows/build-test-site.yaml
+++ b/.github/workflows/build-test-site.yaml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node-version: [15.x]
+        node-version: [16.x]
 
     steps:
       - uses: actions/checkout@v2
diff --git a/wowchemy/assets/scss/wowchemy/layouts/_book.scss b/wowchemy/assets/scss/wowchemy/layouts/_book.scss
index 48d039ac..bf811c5d 100644
--- a/wowchemy/assets/scss/wowchemy/layouts/_book.scss
+++ b/wowchemy/assets/scss/wowchemy/layouts/_book.scss
@@ -90,6 +90,11 @@
   }
 }
 
+.no-navbar .docs-sidebar {
+  top: 0;
+  height: 100vh;
+}
+
 @media (min-width: 1200px) {
   .docs-sidebar {
     flex: 0 1 320px;
diff --git a/wowchemy/layouts/partials/book_sidebar.html b/wowchemy/layouts/partials/book_sidebar.html
index ad78cb05..a21cf56e 100644
--- a/wowchemy/layouts/partials/book_sidebar.html
+++ b/wowchemy/layouts/partials/book_sidebar.html
@@ -2,9 +2,10 @@
   <button class="btn docs-toggle d-md-none p-0 mr-md-3 w-100" type="button" data-toggle="collapse" data-target="#docs-nav" aria-controls="docs-nav" aria-expanded="false" aria-label="Toggle section navigation">
     <div class="d-flex">
       <span class="d-md-none pl-1 flex-grow-1 text-left overflow-hidden">
-        {{ if .Parent | and .Parent.IsHome }}
+        {{/* Don't use piped conditions here in order to utilise short-circuiting */}}
+        {{ if and .Parent .Parent.IsHome }}
           {{ .LinkTitle | emojify }}
-        {{ else if .Parent | and (not .Parent.IsHome) }}
+        {{ else if and .Parent (not .Parent.IsHome) }}
           {{ .Parent.LinkTitle | emojify }}
         {{ else }}
           {{ (i18n "home" | default "Home") | emojify }}
@@ -45,6 +46,10 @@
       {{- $query = .Site.Home.Sections.ByWeight -}}
     {{- end}}
 
+    {{- range $query -}}
+      {{ template "book-menu" dict "sect" . "current_node" $current_node "order_by" $order_by "is_root" $is_root }}
+    {{- end -}}
+
   {{else}}
     {{/* Case where homepage is NOT a book */}}