Correct some layouting, and some textes.

backend/src/emails/templates/accountActivation/html.pug

@@ -12,8 +12,5 @@ block content
     div(class="p_content")= t('emails.general.orCopyLink')
 
     a.clink(href=activationLink) #{activationLink}
-    br
-    br
-    br
 
     include ../includes/requestNewLink.pug

backend/src/emails/templates/addedContributionMessage/html.pug

@@ -9,9 +9,6 @@ block content
     h2= t('emails.addedContributionMessage.readMessage')
     div(class="p_content")= t('emails.addedContributionMessage.toSeeAndAnswerMessage')
 
-    a.clink(href="https://gdd.gradido.net/community/contribution") #{t('emails.general.toAccount')}
+    a.button-3(href="https://gdd.gradido.net/community/contribution") #{t('emails.general.toAccount')}
-    br
-    br
-    br
 
     include ../includes/doNotReply.pug

backend/src/emails/templates/includes/webflow.css

@@ -9,7 +9,7 @@ body{
 }
 
 h2 {
-  margin-top: 0px;
+  margin-top: 15px;
   color: #383838;
 }
 
@@ -31,9 +31,9 @@ h2 {
 
 .content {
   display: block;
-  width: 100%;
+  width: 78%;
-  margin: 40px 0 40px 0;
+  margin: 40px 1% 40px 1%;
-  padding: 20px 0 40px 0;
+  padding: 20px 10% 40px 10%;
   border-radius: 24px;
   background-image: linear-gradient(180deg, #f5f5f5, #f5f5f5);
 }
@@ -41,6 +41,7 @@ h2 {
 .p_content{
   margin: 15px 0 15px 0;
   line-height: 26px;
+  color: #9ca0a8;
 }
 
 .clink {
@@ -60,6 +61,8 @@ h2 {
   border-radius: 20px;
   background-image: radial-gradient(circle farthest-corner at 0% 0%, #f9cd69, #c58d38);
   box-shadow: 16px 13px 35px 0 rgba(56, 56, 56, 0.3);
+  margin: 25px 0 25px 0;
+  width: 50%;
 }
 
 .button-4 {

backend/src/emails/templates/layout.pug

@@ -2,7 +2,7 @@ doctype html
 html(lang=locale)
   head
     meta(
-      content="text/html; charset=UTF-8"
+      content="multipart/mixed; charset=UTF-8"
       http-equiv="content-type"
       )
     meta(

backend/src/emails/templates/resetPassword/html.pug

@@ -12,8 +12,5 @@ block content
     div(class="p_content")= t('emails.general.orCopyLink')
     
     a.clink(href=resetLink) #{resetLink}
-    br
-    br
-    br
 
     include ../includes/requestNewLink.pug

backend/src/emails/templates/transactionLinkRedeemed/html.pug

@@ -13,9 +13,6 @@ block content
       br
       = t('emails.general.detailsYouFindOnLinkToYourAccount')
     
-    a.clink(href="https://gdd.gradido.net/transactions") #{t('emails.general.toAccount')}
+    a.button-3(href="https://gdd.gradido.net/transactions") #{t('emails.general.toAccount')}
-    br
-    br
-    br
 
     include ../includes/doNotReply.pug

backend/src/emails/templates/transactionReceived/html.pug

@@ -9,10 +9,7 @@ block content
     h2= t('emails.general.transactionDetails')
     div(class="p_content")= t('emails.general.detailsYouFindOnLinkToYourAccount')
     
-    a.clink(href="https://gdd.gradido.net/transactions") #{t('emails.general.toAccount')}
+    a.button-3(href="https://gdd.gradido.net/transactions") #{t('emails.general.toAccount')}
-    br
-    br
-    br
 
     include ../includes/doNotReply.pug
 

backend/src/locales/de.json

@@ -4,7 +4,7 @@
       "activateAccount": "Konto aktivieren",
       "emailRegistered": "deine E-Mail-Adresse wurde soeben bei Gradido registriert.",
       "pleaseClickLink": "Klicke bitte hier, um die Registrierung abzuschließen und dein Gradido-Konto zu aktivieren.",
-      "subject": "Gradido: E-Mail Überprüfung",
+      "subject": "E-Mail Überprüfung",
       "title": "E-Mail Überprüfung"
     },
     "accountMultiRegistration": {
@@ -13,13 +13,13 @@
       "emailReused": "deine E-Mail-Adresse wurde soeben erneut benutzt, um bei Gradido ein Konto zu registrieren.",
       "ifYouAreNotTheOne": "Wenn du nicht versucht hast, dich erneut zu registrieren, wende dich bitte an unseren Support:",
       "onForgottenPasswordClickLink": "Solltest du dein Passwort vergessen haben, klicke bitte hier.",
-      "subject": "Gradido: Erneuter Registrierungsversuch mit deiner E-Mail",
+      "subject": "Erneuter Registrierungsversuch mit deiner E-Mail",
       "title": "Erneuter Registrierungsversuch mit deiner E-Mail"
     },
     "addedContributionMessage": {
       "commonGoodContributionMessage": "du hast zu deinem Gemeinwohl-Beitrag „{contributionMemo}“ eine Nachricht von {senderFirstName} {senderLastName} erhalten.",
       "readMessage": "Nachricht lesen und beantworten",
-      "subject": "Gradido: Nachricht zu deinem Gemeinwohl-Beitrag",
+      "subject": "Nachricht zu deinem Gemeinwohl-Beitrag",
       "title": "Nachricht zu deinem Gemeinwohl-Beitrag",
       "toSeeAndAnswerMessage": "Um die Nachricht zu sehen und darauf zu antworten, gehe in deinem Gradido-Konto ins Menü „Schöpfen“ auf den Tab „Meine Beiträge“."
     },
@@ -28,17 +28,17 @@
     },
     "contributionConfirmed": {
       "commonGoodContributionConfirmed": "dein Gemeinwohl-Beitrag „{contributionMemo}“ wurde soeben von {senderFirstName} {senderLastName} bestätigt. Es wurden deinem Gradido-Konto {amountGDD} GDD gutgeschrieben.",
-      "subject": "Gradido: Dein Gemeinwohl-Beitrag wurde bestätigt",
+      "subject": "Dein Gemeinwohl-Beitrag wurde bestätigt",
       "title": "Dein Gemeinwohl-Beitrag wurde bestätigt"
     },
     "contributionDeleted": {
       "commonGoodContributionDeleted": "dein Gemeinwohl-Beitrag „{contributionMemo}“ wurde von {senderFirstName} {senderLastName} gelöscht.",
-      "subject": "Gradido: Dein Gemeinwohl-Beitrag wurde gelöscht",
+      "subject": "Dein Gemeinwohl-Beitrag wurde gelöscht",
       "title": "Dein Gemeinwohl-Beitrag wurde gelöscht"
     },
     "contributionDenied": {
       "commonGoodContributionDenied": "dein Gemeinwohl-Beitrag „{contributionMemo}“ wurde von {senderFirstName} {senderLastName} abgelehnt.",
-      "subject": "Gradido: Dein Gemeinwohl-Beitrag wurde abgelehnt",
+      "subject": "Dein Gemeinwohl-Beitrag wurde abgelehnt",
       "title": "Dein Gemeinwohl-Beitrag wurde abgelehnt"
     },
     "footer": {
@@ -70,19 +70,19 @@
     },
     "resetPassword": {
       "pleaseClickLink": "Wenn du es warst, klicke bitte hier.",
-      "subject": "Gradido: Passwort zurücksetzen",
+      "subject": "Passwort zurücksetzen",
       "title": "Passwort zurücksetzen",
       "youOrSomeoneResetPassword": "du oder jemand anderes, hast für dieses Konto ein Zurücksetzen des Passworts angefordert."
     },
     "transactionLinkRedeemed": {
       "hasRedeemedYourLink": "{senderFirstName} {senderLastName} ({senderEmail}) hat soeben deinen Link eingelöst.",
       "memo": "Nachricht: {transactionMemo}",
-      "subject": "Gradido: {senderFirstName} {senderLastName} hat deinen Gradido-Link eingelöst",
+      "subject": "{senderFirstName} {senderLastName} hat deinen Gradido-Link eingelöst",
       "title": "{senderFirstName} {senderLastName} hat deinen Gradido-Link eingelöst"
     },
     "transactionReceived": {
       "haveReceivedAmountGDDFrom": "du hast soeben {transactionAmount} GDD von {senderFirstName} {senderLastName} ({senderEmail}) erhalten.",
-      "subject": "Gradido: {senderFirstName} {senderLastName} hat dir {transactionAmount} Gradido gesendet",
+      "subject": "{senderFirstName} {senderLastName} hat dir {transactionAmount} Gradido gesendet",
       "title": "{senderFirstName} {senderLastName} hat dir {transactionAmount} Gradido gesendet"
     }
   },

backend/src/locales/en.json

@@ -4,7 +4,7 @@
       "activateAccount": "Activate account",
       "emailRegistered": "Your email address has just been registered with Gradido.",
       "pleaseClickLink": "Please click here to complete the registration and activate your Gradido account.",
-      "subject": "Gradido: Email Verification",
+      "subject": "Email Verification",
       "title": "Email Verification"
     },
     "accountMultiRegistration": {
@@ -13,13 +13,13 @@
       "emailReused": "Your email address has just been used again to register an account with Gradido.",
       "ifYouAreNotTheOne": "If you did not try to register again, please contact our support:",
       "onForgottenPasswordClickLink": "If you have forgotten your password, please click here.",
-      "subject": "Gradido: Try To Register Again With Your Email",
+      "subject": "Try To Register Again With Your Email",
       "title": "Try To Register Again With Your Email"
     },
     "addedContributionMessage": {
       "commonGoodContributionMessage": "You have received a message from {senderFirstName} {senderLastName} regarding your common good contribution “{contributionMemo}”.",
       "readMessage": "Read and reply to message",
-      "subject": "Gradido: Message about your common good contribution",
+      "subject": "Message about your common good contribution",
       "title": "Message about your common good contribution",
       "toSeeAndAnswerMessage": "To view and reply to the message, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab."
     },
@@ -28,17 +28,17 @@
     },
     "contributionConfirmed": {
       "commonGoodContributionConfirmed": "Your common good contribution “{contributionMemo}” has just been approved by {senderFirstName} {senderLastName}. Your Gradido account has been credited with {amountGDD} GDD.",
-      "subject": "Gradido: Your contribution to the common good was confirmed",
+      "subject": "Your contribution to the common good was confirmed",
       "title": "Your contribution to the common good was confirmed"
     },
     "contributionDeleted": {
       "commonGoodContributionDeleted": "Your common good contribution “{contributionMemo}” was deleted by {senderFirstName} {senderLastName}.",
-      "subject": "Gradido: Your common good contribution was deleted",
+      "subject": "Your common good contribution was deleted",
       "title": "Your common good contribution was deleted"
     },
     "contributionDenied": {
       "commonGoodContributionDenied": "Your common good contribution “{contributionMemo}” was rejected by {senderFirstName} {senderLastName}.",
-      "subject": "Gradido: Your common good contribution was rejected",
+      "subject": "Your common good contribution was rejected",
       "title": "Your common good contribution was rejected"
     },
     "footer": {
@@ -70,19 +70,19 @@
     },
     "resetPassword": {
       "pleaseClickLink": "If it was you, please click here.",
-      "subject": "Gradido: Reset password",
+      "subject": "Reset password",
       "title": "Reset password",
       "youOrSomeoneResetPassword": "You, or someone else, requested a password reset for this account."
     },
     "transactionLinkRedeemed": {
       "hasRedeemedYourLink": "{senderFirstName} {senderLastName} ({senderEmail}) has just redeemed your link.",
       "memo": "Message: {transactionMemo}",
-      "subject": "Gradido: {senderFirstName} {senderLastName} has redeemed your Gradido link",
+      "subject": "{senderFirstName} {senderLastName} has redeemed your Gradido link",
       "title": "{senderFirstName} {senderLastName} has redeemed your Gradido link"
     },
     "transactionReceived": {
       "haveReceivedAmountGDDFrom": "You have just received {transactionAmount} GDD from {senderFirstName} {senderLastName} ({senderEmail}).",
-      "subject": "Gradido: {senderFirstName} {senderLastName} has sent you {transactionAmount} Gradido",
+      "subject": "{senderFirstName} {senderLastName} has sent you {transactionAmount} Gradido",
       "title": "{senderFirstName} {senderLastName} has sent you {transactionAmount} Gradido"
     }
   },