From d11b8d78efaccc08664e83ffcc3bec496eacef71 Mon Sep 17 00:00:00 2001 From: Jeremy Thomas Date: Thu, 26 Oct 2017 20:00:25 +0100 Subject: [PATCH] Fix scroll factor --- docs/_javascript/main.js | 8 +++++--- docs/_sass/specific.sass | 2 +- docs/css/bulma-docs.css | 2 +- docs/lib/main.js | 8 +++++--- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/docs/_javascript/main.js b/docs/_javascript/main.js index 4130d3eb3..4c6bfc184 100644 --- a/docs/_javascript/main.js +++ b/docs/_javascript/main.js @@ -174,7 +174,7 @@ document.addEventListener('DOMContentLoaded', () => { let pinned = false; let horizon = navbarHeight; let whereYouStoppedScrolling = 0; - let threshold = 200; + let threshold = 160; let scrollFactor = 0; navbarBurger.addEventListener('click', el => { @@ -227,10 +227,12 @@ document.addEventListener('DOMContentLoaded', () => { transform: translateY(${translateValue}px); `; - if (currentY > threshold) { + if (currentY > threshold * 2) { scrollFactor = 1; + } else if (currentY > threshold) { + scrollFactor = (currentY - threshold) / threshold; } else { - scrollFactor = currentY / threshold; + scrollFactor = 0; } specialShadow.style.opacity = scrollFactor; specialShadow.style.transform = 'scaleY(' + translateFactor + ')'; diff --git a/docs/_sass/specific.sass b/docs/_sass/specific.sass index 858d99517..7d8f02961 100644 --- a/docs/_sass/specific.sass +++ b/docs/_sass/specific.sass @@ -1,6 +1,6 @@ .bd-special-shadow background-image: linear-gradient(rgba(#000, 0.1), rgba(#000, 0)) - height: 10px + height: 8px left: 0 opacity: 0 position: absolute diff --git a/docs/css/bulma-docs.css b/docs/css/bulma-docs.css index c07e8186e..9af8897a9 100644 --- a/docs/css/bulma-docs.css +++ b/docs/css/bulma-docs.css @@ -10356,7 +10356,7 @@ svg { .bd-special-shadow { background-image: linear-gradient(rgba(0, 0, 0, 0.1), transparent); - height: 10px; + height: 8px; left: 0; opacity: 0; position: absolute; diff --git a/docs/lib/main.js b/docs/lib/main.js index 5a433b71d..41749518d 100644 --- a/docs/lib/main.js +++ b/docs/lib/main.js @@ -176,7 +176,7 @@ document.addEventListener('DOMContentLoaded', function () { var pinned = false; var horizon = navbarHeight; var whereYouStoppedScrolling = 0; - var threshold = 200; + var threshold = 160; var scrollFactor = 0; navbarBurger.addEventListener('click', function (el) { @@ -227,10 +227,12 @@ document.addEventListener('DOMContentLoaded', function () { var translateFactor = 1 + translateValue / navbarHeight; var navbarStyle = '\n transform: translateY(' + translateValue + 'px);\n '; - if (currentY > threshold) { + if (currentY > threshold * 2) { scrollFactor = 1; + } else if (currentY > threshold) { + scrollFactor = (currentY - threshold) / threshold; } else { - scrollFactor = currentY / threshold; + scrollFactor = 0; } specialShadow.style.opacity = scrollFactor; specialShadow.style.transform = 'scaleY(' + translateFactor + ')'; -- 2.47.2