Merge Minor into main #113

Manually merged
niggl merged 416 commits from dev into main 2021-03-26 16:34:56 +00:00
6 changed files with 18 additions and 12 deletions
Showing only changes of commit ed13a0d14b - Show all commits

View File

@ -138,9 +138,10 @@
) )
.then((response) => { .then((response) => {
if (response.status != '200') { if (response.status != '200') {
const toast = Toastify({ toast.hideToast();
Toastify({
text: $_('pdf-generation-failed'), text: $_('pdf-generation-failed'),
duration: 1000, duration: 3500,
backgroundColor: backgroundColor:
'linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)', 'linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)',
}).showToast(); }).showToast();

View File

@ -68,9 +68,10 @@
) )
.then((response) => { .then((response) => {
if (response.status != '200') { if (response.status != '200') {
const toast = Toastify({ toast.hideToast();
Toastify({
text: $_('pdf-generation-failed'), text: $_('pdf-generation-failed'),
duration: 1000, duration: 3500,
backgroundColor: backgroundColor:
'linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)', 'linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)',
}).showToast(); }).showToast();

View File

@ -151,9 +151,10 @@
) )
.then((response) => { .then((response) => {
if (response.status != '200') { if (response.status != '200') {
const toast = Toastify({ toast.hideToast();
Toastify({
text: $_('pdf-generation-failed'), text: $_('pdf-generation-failed'),
duration: 1000, duration: 3500,
backgroundColor: backgroundColor:
'linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)', 'linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)',
}).showToast(); }).showToast();

View File

@ -99,9 +99,10 @@
) )
.then((response) => { .then((response) => {
if (response.status != '200') { if (response.status != '200') {
const toast = Toastify({ toast.hideToast();
Toastify({
text: $_('pdf-generation-failed'), text: $_('pdf-generation-failed'),
duration: 1000, duration: 3500,
backgroundColor: backgroundColor:
'linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)', 'linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)',
}).showToast(); }).showToast();

View File

@ -120,9 +120,10 @@
) )
.then((response) => { .then((response) => {
if (response.status != '200') { if (response.status != '200') {
const toast = Toastify({ toast.hideToast();
Toastify({
text: $_('pdf-generation-failed'), text: $_('pdf-generation-failed'),
duration: 1000, duration: 3500,
backgroundColor: backgroundColor:
'linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)', 'linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)',
}).showToast(); }).showToast();

View File

@ -70,9 +70,10 @@
) )
.then((response) => { .then((response) => {
if (response.status != '200') { if (response.status != '200') {
const toast = Toastify({ toast.hideToast();
Toastify({
text: $_('pdf-generation-failed'), text: $_('pdf-generation-failed'),
duration: 1000, duration: 3500,
backgroundColor: backgroundColor:
'linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)', 'linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)',
}).showToast(); }).showToast();