From 0ae17fd1d909bdb1e95b23e69ee40876ad0cee94 Mon Sep 17 00:00:00 2001 From: Jeroen De Meerleer Date: Thu, 27 Jan 2022 15:03:28 +0100 Subject: [PATCH] BUGFIX: remove unnecessary scrolling --- assets/js/page.js | 6 +++--- assets/scss/custom.scss | 17 +++++++++++------ public/.htaccess | 1 - 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/assets/js/page.js b/assets/js/page.js index 2b35e4a..a3ab008 100644 --- a/assets/js/page.js +++ b/assets/js/page.js @@ -10,9 +10,9 @@ document.addEventListener("readystatechange", event => { function initOverflow() { let body = document.querySelector('body'); - if (body.scrollHeight > window.outerHeight) { - body.style.height = 'auto'; - } + let nineties = document.querySelector('.nineties-toggle'); + let container = document.querySelector('.container'); + container.style.height = (body.scrollHeight > window.outerHeight) ? 'auto' : body.scrollHeight - nineties.scrollHeight + 'px'; } function initNinetiesToggle() { diff --git a/assets/scss/custom.scss b/assets/scss/custom.scss index d6a6630..c203a73 100644 --- a/assets/scss/custom.scss +++ b/assets/scss/custom.scss @@ -3,10 +3,15 @@ @import "~bootstrap/scss/utilities"; $utilities: map-merge( - $utilities, ( - "width": map-merge( - map-get($utilities, "width"), - ( responsive: true ), - ), + $utilities, + ( + "width": + map-merge( + map-get($utilities, "width"), + ( + responsive: true + ) + ) ) -); \ No newline at end of file +); + diff --git a/public/.htaccess b/public/.htaccess index 48a7a3d..7ded04e 100644 --- a/public/.htaccess +++ b/public/.htaccess @@ -1,4 +1,3 @@ RewriteEngine on -RewriteCond %{REQUEST_FILENAME} !-d RewriteCond %{REQUEST_FILENAME} !-f RewriteRule . index.php [L] \ No newline at end of file