diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js
index 7f7bc664d..d45322c39 100644
--- a/frontend/.eslintrc.js
+++ b/frontend/.eslintrc.js
@@ -54,6 +54,13 @@ module.exports = {
'settings.password.set',
'settings.password.set-password.text',
'settings.password.subtitle',
+ 'math.asterisk',
+ 'pageTitle.overview',
+ 'pageTitle.send',
+ 'pageTitle.transactions',
+ 'pageTitle.gdt',
+ 'pageTitle.community',
+ 'pageTitle.settings',
],
enableFix: false,
},
diff --git a/frontend/src/assets/scss/gradido-template.scss b/frontend/src/assets/scss/gradido-template.scss
index 9bf6371ea..5e2408583 100644
--- a/frontend/src/assets/scss/gradido-template.scss
+++ b/frontend/src/assets/scss/gradido-template.scss
@@ -9,12 +9,8 @@ body {
cursor: pointer;
}
-.hoverText:hover {
- font-weight: bold;
-}
-
-.hoverIcon:hover {
- background-color: rgb(220, 216, 217);
+.hover-icon:hover {
+ background-color: rgb(220 216 217);
border-radius: 29px;
padding: 1px;
}
@@ -31,7 +27,6 @@ body {
color: #0e79bc !important;
}
-
/* Navbar */
a,
.navbar-light,
@@ -316,16 +311,13 @@ a:hover,
@keyframes pulse {
0% {
box-shadow: 0 0 0 0 #c58d387e;
- box-shadow: 0 0 0 0 #c58d387e;
}
70% {
box-shadow: 0 0 0 20px rgb(204 169 44 / 0%);
- box-shadow: 0 0 0 20px rgb(204 169 44 / 0%);
}
100% {
box-shadow: 0 0 0 0 rgb(204 169 44 / 0%);
- box-shadow: 0 0 0 0 rgb(204 169 44 / 0%);
}
}
diff --git a/frontend/src/components/Template/ContentHeader/GddAmount.vue b/frontend/src/components/Template/ContentHeader/GddAmount.vue
index 36f2ac1da..94875a210 100644
--- a/frontend/src/components/Template/ContentHeader/GddAmount.vue
+++ b/frontend/src/components/Template/ContentHeader/GddAmount.vue
@@ -46,7 +46,7 @@
diff --git a/frontend/src/components/Template/ContentHeader/GdtAmount.vue b/frontend/src/components/Template/ContentHeader/GdtAmount.vue
index 46f9c0899..b066ff4c2 100644
--- a/frontend/src/components/Template/ContentHeader/GdtAmount.vue
+++ b/frontend/src/components/Template/ContentHeader/GdtAmount.vue
@@ -41,7 +41,7 @@
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 195c11aa0..098366e38 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -30,6 +30,7 @@
"openContributionLinkText": "Folgende {count} automatische Schöpfungen werden zur Zeit durch die Gemeinschaft „{name}“ bereitgestellt.",
"submitContribution": "schreiben"
},
+ "communityInfo": "Gemeinschaft Information",
"contact": "Kontakt",
"contribution": {
"activity": "Tätigkeit",
@@ -123,6 +124,7 @@
"firstname": "Vorname",
"from": "Von",
"generate_now": "Jetzt generieren",
+ "hours": "Stunden",
"lastname": "Nachname",
"memo": "Nachricht",
"message": "Nachricht",
@@ -145,7 +147,6 @@
"send_transaction_success": "Deine Transaktion wurde erfolgreich ausgeführt",
"sorry": "Entschuldigung",
"thx": "Danke",
- "hours": "Stunden",
"to": "bis",
"to1": "an",
"validation": {
@@ -244,6 +245,15 @@
"support": "Support",
"transactions": "Transaktionen"
},
+ "pageTitle": {
+ "community": "Meine Gemeinschaft",
+ "gdt": "Deine GDT Transaktionen",
+ "information": "{community}",
+ "overview": "Willkommen {name}",
+ "send": "Sende Gradidos",
+ "settings": "Einstellungen",
+ "transactions": "Deine Transaktionen"
+ },
"qrCode": "QR Code",
"send_gdd": "GDD versenden",
"send_per_link": "GDD versenden per Link",
@@ -329,15 +339,5 @@
"send_you": "sendet dir"
},
"via_link": "über einen Link",
- "welcome": "Willkommen in der Gemeinschaft",
- "communityInfo":"Gemeinschaft Information",
- "pageTitle": {
- "overview":"Willkommen {name}",
- "send":"Sende Gradidos",
- "transactions":"Deine Transaktionen",
- "gdt":"Deine GDT Transaktionen",
- "community":"Meine Gemeinschaft",
- "information":"{community}",
- "settings":"Einstellungen"
- }
+ "welcome": "Willkommen in der Gemeinschaft"
}
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 5fb0a23ba..3bfd27f8e 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -30,6 +30,7 @@
"openContributionLinkText": "The following {count} automatic creations are currently provided by the \"{name}\" community.",
"submitContribution": "writing"
},
+ "communityInfo": "Community Information",
"contact": "Contact",
"contribution": {
"activity": "Activity",
@@ -123,6 +124,7 @@
"firstname": "Firstname",
"from": "from",
"generate_now": "Generate now",
+ "hours": "Horas",
"lastname": "Lastname",
"memo": "Message",
"message": "Message",
@@ -145,7 +147,6 @@
"send_transaction_success": "Your transaction was successfully completed",
"sorry": "Sorry",
"thx": "Thank you",
- "hours": "Horas",
"to": "to",
"to1": "to",
"validation": {
@@ -244,6 +245,15 @@
"support": "Support",
"transactions": "Transactions"
},
+ "pageTitle": {
+ "community": "My community",
+ "gdt": "Your GDT transactions",
+ "information": "{community}",
+ "overview": "Welcome {name}",
+ "send": "Send Gradidos",
+ "settings": "Settings",
+ "transactions": "Your transactions"
+ },
"qrCode": "QR Code",
"send_gdd": "Send GDD",
"send_per_link": "Send GDD via Link",
@@ -329,15 +339,5 @@
"send_you": "wants to send you"
},
"via_link": "via Link",
- "welcome": "Welcome to the community",
- "communityInfo":"Community Information",
- "pageTitle": {
- "overview": "Welcome {name}",
- "send": "Send Gradidos",
- "transactions": "Your transactions",
- "gdt": "Your GDT transactions",
- "community": "My community",
- "information":"{community}",
- "settings": "Settings"
- }
+ "welcome": "Welcome to the community"
}
diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json
index b6577ac20..95d0426de 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -121,6 +121,7 @@
"firstname": " Prénom",
"from": "de",
"generate_now": "Produire maintenant",
+ "hours": "Uren",
"lastname": "Nom",
"memo": "Note",
"message": "Message",
@@ -143,7 +144,6 @@
"send_transaction_success": "Votre transaction a été effectuée avec succès",
"sorry": "Désolé",
"thx": "Merci",
- "hours": "Uren",
"to": "à",
"to1": "à",
"validation": {
diff --git a/frontend/src/locales/tr.json b/frontend/src/locales/tr.json
index 48fb44c07..33642f3c6 100644
--- a/frontend/src/locales/tr.json
+++ b/frontend/src/locales/tr.json
@@ -114,6 +114,7 @@
"firstname": "Ad",
"from": "Gönderen",
"generate_now": "Şimdi oluştur",
+ "hours": "Saat",
"lastname": "Soyadı",
"memo": "Mesaj",
"message": "Mesaj",
@@ -135,7 +136,6 @@
"send_transaction_success": "İşleminiz başarıyla tamamlandı",
"sorry": "Üzgünüz",
"thx": "Teşekkür ederiz",
- "hours": "Saat",
"to": "Geçerlik",
"to1": "Alıcı",
"validation": {