From deeba675fa7e758c2d81f22da2ba31c4d28562cd Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Tue, 20 Nov 2018 18:28:07 +0100 Subject: [PATCH] Slightly touched up modals --- templates/standalone/modal.julius | 3 ++- templates/standalone/modal.lucius | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/templates/standalone/modal.julius b/templates/standalone/modal.julius index 65eb3fef0..00486e6a8 100644 --- a/templates/standalone/modal.julius +++ b/templates/standalone/modal.julius @@ -90,8 +90,9 @@ var body = doc.body, html = doc.documentElement; var height = Math.max( body.scrollHeight, body.offsetHeight, html.clientHeight, html.scrollHeight, html.offsetHeight ); - frame.style.height = "calc(" + (height + "px") + " + 1em)"; + frame.style.height = height.toPrecision() + "px"; frame.style.visibility = 'visible'; + frame.setAttribute("scrolling", "no"); doc.querySelectorAll("form").forEach(function(form) { form.setAttribute("target", "_top"); diff --git a/templates/standalone/modal.lucius b/templates/standalone/modal.lucius index 194c69515..5ba3a7a07 100644 --- a/templates/standalone/modal.lucius +++ b/templates/standalone/modal.lucius @@ -4,14 +4,14 @@ div.modal { top: 50%; transform: translate(-50%, -50%) scale(0.8, 0.8); display: block; - background-color: rgba(255, 255, 255, 0.99); + background-color: rgba(255, 255, 255, 1); min-width: 60vw; min-height: 100px; max-height: calc(100vh - 30px); border-radius: 2px; z-index: -1; color: var(--color-font); - padding: 20px; + /* padding: 20px; */ padding-right: 65px; overflow: auto; transition: all .15s ease; @@ -29,8 +29,11 @@ div.modal { height: calc(60vh); width: 100%; border-style: none; - scroll: auto; overflow: auto; + + [scrolling='no'] { + overflow: hidden; + } } }