Mercurial > gemma
changeset 5189:5c52d6d69545 new-fwa
Merged default into new-fwa branch.
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Thu, 02 Apr 2020 15:09:29 +0200 |
parents | f742b5cf9a64 (current diff) 673f2a00c767 (diff) |
children | c3765d8e2a90 |
files | |
diffstat | 4 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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 {
--- 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";
--- 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,
--- 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";