From 4f82391dfe524e526a0940717a98dd4d0e420d07 Mon Sep 17 00:00:00 2001 From: janekptacijarabaci Date: Sat, 5 May 2018 10:46:33 +0200 Subject: [follow up] moebius#154: Notifications - user settings - the immediate duration of the alert https://github.com/MoonchildProductions/moebius/pull/154 https://github.com/MoonchildProductions/UXP/pull/132 --- toolkit/components/alerts/resources/content/alert.js | 2 ++ toolkit/themes/shared/alert-common.css | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'toolkit') diff --git a/toolkit/components/alerts/resources/content/alert.js b/toolkit/components/alerts/resources/content/alert.js index ce60ab0fa..12068b548 100644 --- a/toolkit/components/alerts/resources/content/alert.js +++ b/toolkit/components/alerts/resources/content/alert.js @@ -313,6 +313,7 @@ function onAlertClick() { let alertBox = document.getElementById("alertBox"); if (alertBox.getAttribute("animate") == "true") { // Closed when the animation ends. + alertBox.style.animationDuration = ".6s"; alertBox.setAttribute("clicked", "true"); } else { window.close(); @@ -355,6 +356,7 @@ function onAlertClose() { let alertBox = document.getElementById("alertBox"); if (alertBox.getAttribute("animate") == "true") { // Closed when the animation ends. + alertBox.style.animationDuration = ".6s"; alertBox.setAttribute("closing", "true"); } else { window.close(); diff --git a/toolkit/themes/shared/alert-common.css b/toolkit/themes/shared/alert-common.css index 010e89393..17510c0db 100644 --- a/toolkit/themes/shared/alert-common.css +++ b/toolkit/themes/shared/alert-common.css @@ -15,14 +15,12 @@ } #alertBox[animate][clicked] { - animation-duration: .6s; animation-name: alert-clicked-animation; } /* This is used if the close button is clicked before the animation has finished. */ #alertBox[animate][closing] { - animation-duration: .6s; animation-name: alert-closing-animation; } -- cgit v1.2.3