# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1585832969 -7200
# Node ID 5c52d6d69545c4d191e4285265e4df724e4da52c
# Parent  f742b5cf9a64e27ba848dfb5f95b841db68457e6# Parent  673f2a00c767ae89dcd4253ed85c93e2466734b0
Merged default into new-fwa branch.

diff -r f742b5cf9a64 -r 5c52d6d69545 client/src/assets/application.scss
--- a/client/src/assets/application.scss	Thu Apr 02 11:40:21 2020 +0200
+++ b/client/src/assets/application.scss	Thu Apr 02 15:09:29 2020 +0200
@@ -195,6 +195,9 @@
   .snotifyToast__title {
     font-size: 1.2rem;
   }
+  .snotifyToast__body {
+    white-space: pre-line;
+  }
 }
 
 select.form-control-sm.small {
diff -r f742b5cf9a64 -r 5c52d6d69545 client/src/components/TimeSlider.vue
--- a/client/src/components/TimeSlider.vue	Thu Apr 02 11:40:21 2020 +0200
+++ b/client/src/components/TimeSlider.vue	Thu Apr 02 15:09:29 2020 +0200
@@ -77,7 +77,8 @@
  * Software engineering by Intevation GmbH
  *
  * Author(s):
- * Fadi Abbud <fadiabbud@intevation.de>
+ * Fadi Abbud <fadi.abbud@intevation.de>
+ * Thomas Junk <thomas.junk@intevation.de>
  */
 import { mapState } from "vuex";
 import * as d3 from "d3";
diff -r f742b5cf9a64 -r 5c52d6d69545 client/src/components/importoverview/ImportOverview.vue
--- a/client/src/components/importoverview/ImportOverview.vue	Thu Apr 02 11:40:21 2020 +0200
+++ b/client/src/components/importoverview/ImportOverview.vue	Thu Apr 02 15:09:29 2020 +0200
@@ -503,7 +503,7 @@
                     if (x.message) return x.message;
                     if (x.error) return x.error;
                   })
-                  .join("\n\n");
+                  .join("\n");
                 displayInfo({
                   title: "Staging Area",
                   message: messages,
diff -r f742b5cf9a64 -r 5c52d6d69545 client/src/components/toolbar/TimeSlider.vue
--- a/client/src/components/toolbar/TimeSlider.vue	Thu Apr 02 11:40:21 2020 +0200
+++ b/client/src/components/toolbar/TimeSlider.vue	Thu Apr 02 15:09:29 2020 +0200
@@ -24,7 +24,8 @@
  * Software engineering by Intevation GmbH
  *
  * Author(s):
- * Fadi Abbud <fadiabbud@intevation.de>
+ * Fadi Abbud <fadi.abbud@intevation.de>
+ * Thomas Junk <thomas.junk@intevation.de>
  */
 import { mapState } from "vuex";
 import locale2 from "locale2";