diff --git a/public/assets/css/modal.css b/public/assets/css/modal.css index edfdf4c..9d5eaaf 100644 --- a/public/assets/css/modal.css +++ b/public/assets/css/modal.css @@ -14,7 +14,7 @@ body .modal.active ~ main .screen { } .modal.active + .modal { - z-index: 5; + z-index: 10; } /* -- Boilerplate -- */ @@ -154,12 +154,10 @@ body .modal.active ~ main .screen { body .modal { transition: var(--transition); transition-delay: calc(var(--transition) / 2); - backdrop-filter: blur(0); } body .modal.active { transition-delay: 1ms; - backdrop-filter: blur(10px); } /* -- Boilerplate -- */ @@ -167,4 +165,15 @@ body .modal.active ~ main .screen { .modal.card .inner { align-self: unset; } + + .modal.dialog .inner { + width: unset; + min-width: 100px; + max-width: 50vw; + } + + .modal.dialog .button { + align-self: unset; + width: clamp(100px,100%,500px); + } } \ No newline at end of file diff --git a/public/assets/css/style.css b/public/assets/css/style.css index 48e55e6..b129092 100644 --- a/public/assets/css/style.css +++ b/public/assets/css/style.css @@ -168,6 +168,14 @@ body.dark .screen.dark { gap: var(--padding); } +p.button { + padding: unset; + display: inline; + font-size: inherit; + color: var(--swatch-accent); + text-decoration: underline; +} + .button.solid { background-color: var(--swatch-contrast); color: var(--swatch-background); diff --git a/public/assets/js/modules/Modals.mjs b/public/assets/js/modules/Modals.mjs index 819d509..7ec04d0 100644 --- a/public/assets/js/modules/Modals.mjs +++ b/public/assets/js/modules/Modals.mjs @@ -10,6 +10,19 @@ class Modal extends Interaction { let interactions = { close: () => { this.close(); + }, + openPage: (event) => { + let modal = undefined; + switch(event.target.dataset.type) { + case "card": + modal = new Card({}); + break; + case "dialog": + default: + modal = new Dialog({}); + break; + } + modal.openPage(event.target.dataset.value); } }; // Combine template and incoming interactions into one object diff --git a/public/assets/js/script.js b/public/assets/js/script.js index 59bf50f..d47500e 100644 --- a/public/assets/js/script.js +++ b/public/assets/js/script.js @@ -54,12 +54,6 @@ const interactions = { event.target.classList.remove("copied"); destroy(copied); },1000); - }, - showPgpKey: () => { - module.then(modals => { - const dialog = new modals.Dialog(); - dialog.openPage("contact_email_pgp"); - }); } }; diff --git a/public/assets/pages/contact.html b/public/assets/pages/contact.html index 7f56c64..43a58c9 100644 --- a/public/assets/pages/contact.html +++ b/public/assets/pages/contact.html @@ -23,7 +23,7 @@ } .contact .item img { - height: 10vh; + height: 8vh; } @media (max-width: 300px) { diff --git a/public/assets/pages/contact_email.html b/public/assets/pages/contact_email.html index 04b9dfe..ec93463 100644 --- a/public/assets/pages/contact_email.html +++ b/public/assets/pages/contact_email.html @@ -50,9 +50,9 @@ } } -