Merge branch 'master' into edit-url-text

Author: recrwplay

preview-src/tables.adoc

@@ -5,6 +5,7 @@
 // :page-edit-url-body: Custom raise an issue body text
 // :page-edit-url-title: Custom raise an issue title text
 :page-edit-url-uri: https://github.com/neo4j/docs-cypher/blob/dev/modules/ROOT/pages/queries/index.adoc
+:page-custom-canonical: https://neo4j.com/docs/cypher-manual/current/clauses/where/
 
 .No striping
 // Alternative to stripes attributes is

src/js/02-on-this-page.js

@@ -32,6 +32,10 @@
   var menu = sidebar.querySelector('.toc-menu-placeholder')
   if (!menu) (menu = document.createElement('div')).className = 'toc-menu-placeholder'
 
+  if (document.querySelector('body.has-banner')) {
+    document.querySelector('.toc-menu').style.top = 'calc(var(--toc-top) + var(--banner-height))'
+  }
+
   var title = document.createElement('h2')
   title.textContent = sidebar.dataset.title || 'Contents'
   menu.appendChild(title)
@@ -87,7 +91,8 @@
       if (lastActiveFragment) links[lastActiveFragment].classList.remove('is-active')
       var activeLink = links[activeFragment]
       activeLink.classList.add('is-active')
-      if (list.scrollHeight > list.offsetHeight) {
+      // don't scroll page contents if cheat-sheet
+      if (list.scrollHeight > list.offsetHeight && !document.querySelector('body.cheat-sheet')) {
         list.scrollTop = Math.max(0, activeLink.offsetTop + activeLink.offsetHeight - list.offsetHeight)
       }
       lastActiveFragment = activeFragment

src/js/12-fragment-jumper.js

@@ -33,9 +33,9 @@
       var scrollTarget = this.closest('div')
       var selectorsTop = document.querySelector('.nav-container .selectors').querySelector('div').getBoundingClientRect().top
       if (this.tagName === 'H3') topOffset = selectorsTop
-      window.scrollTo(0, computePosition(scrollTarget, 0) - topOffset)
+      window.scrollTo(0, computePosition(scrollTarget, 0) - (topOffset + 20))
     } else {
-      window.scrollTo(0, computePosition(target, 0) - topOffset)
+      window.scrollTo(0, computePosition(target, 0) - (topOffset + 20))
     }
   }
 

src/partials/head-info.hbs

@@ -3,8 +3,14 @@
     <link rel="canonical" href="{{{this}}}">
     {{/with}}
     {{else}}
+    {{#if page.attributes.custom-canonical}}
+    {{#with page.attributes.custom-canonical}}
+    <link rel="canonical" href="{{{this}}}">
+    {{/with}}    
+    {{else}}
     <link rel="canonical" href="https://neo4j.com{{{ page.attributes.canonical-root }}}{{ page.url }}">
     {{/if}}
+    {{/if}}
 
     {{#unless (eq page.attributes.pagination undefined)}}
     {{#with page.previous}}