From 44f9170f07931cbd1133f171ddabaaa84dcd1a9c Mon Sep 17 00:00:00 2001
From: George Cushen <gcushen@users.noreply.github.com>
Date: Sat, 5 Oct 2019 18:39:33 +0100
Subject: [PATCH] fix: in-page anchor scrolling on mobile

---
 assets/js/academic.js           | 6 +++++-
 layouts/partials/page_edit.html | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/assets/js/academic.js b/assets/js/academic.js
index 89efc20a..c2d5b833 100644
--- a/assets/js/academic.js
+++ b/assets/js/academic.js
@@ -13,8 +13,12 @@
 
   // Dynamically get responsive navigation bar height for offsetting Scrollspy.
   function getNavBarHeight() {
-    let $navbar = $('.navbar');
+    let $navbar = $('#navbar-main');
+    let $navbar_collapse_show = $('#navbar-main .navbar-collapse.collapse.show');
     let navbar_offset = $navbar.innerHeight();
+    if ($navbar_collapse_show.length){
+      navbar_offset -= $navbar_collapse_show.innerHeight();
+    }
     console.debug('Navbar height: ' + navbar_offset);
     return navbar_offset;
   }
diff --git a/layouts/partials/page_edit.html b/layouts/partials/page_edit.html
index c9254b40..57d7bfc0 100644
--- a/layouts/partials/page_edit.html
+++ b/layouts/partials/page_edit.html
@@ -1,3 +1,4 @@
+{{ if site.Params.edit_page }}{{/* Make `edit_page` optional in `params.toml` - prevent errors if it's removed. */}}
 {{ if site.Params.edit_page.repo_url | and (index site.Params.edit_page.editable .Type) | and (ne .Params.editable false) | or .Params.editable }}
 <p class="edit-page">
   <a href="{{site.Params.edit_page.repo_url}}/edit/{{site.Params.edit_page.repo_branch | default "master"}}/content/{{.File.Path}}">
@@ -5,3 +6,4 @@
   </a>
 </p>
 {{ end }}
+{{ end }}