summaryrefslogtreecommitdiffstats
path: root/toolkit
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-05-05 15:44:25 +0200
committerGitHub <noreply@github.com>2018-05-05 15:44:25 +0200
commit7d5f95a8e57de5255ad2767342c1f2392b6f261f (patch)
treebcbf355b0b2d36e6a9555d24373decc478834953 /toolkit
parent3ca0ca4b6790e2b72fbbebed13db79055e85b8ab (diff)
parent4f82391dfe524e526a0940717a98dd4d0e420d07 (diff)
downloadUXP-7d5f95a8e57de5255ad2767342c1f2392b6f261f.tar
UXP-7d5f95a8e57de5255ad2767342c1f2392b6f261f.tar.gz
UXP-7d5f95a8e57de5255ad2767342c1f2392b6f261f.tar.lz
UXP-7d5f95a8e57de5255ad2767342c1f2392b6f261f.tar.xz
UXP-7d5f95a8e57de5255ad2767342c1f2392b6f261f.zip
Merge pull request #333 from janekptacijarabaci/notifications_settings_2
[follow up] moebius#154: Notifications - user settings - the immediate duration of the alert (fix for "New layout of XUL Notifications")
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/components/alerts/resources/content/alert.js2
-rw-r--r--toolkit/themes/shared/alert-common.css2
2 files changed, 2 insertions, 2 deletions
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;
}