fix cheat-sheet scroll and contents offset

Author: recrwplay

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))
     }
   }