Merge branch 'master' into link-text-for-emails

frontend/src/components/Auth/AuthNavbar.vue

@@ -46,7 +46,7 @@ export default {
 
 <style lang="scss">
 .authNavbar > .nav-link {
-  color: #383838 !important;
+  color: #0e79bc !important;
 }
 
 .navbar-toggler {
@@ -54,7 +54,7 @@ export default {
 }
 
 .authNavbar > .router-link-exact-active {
-  color: #0e79bc !important;
+  color: #383838 !important;
 }
 
 button.navbar-toggler > span.navbar-toggler-icon {

frontend/src/components/LanguageSwitch2.vue

@@ -5,7 +5,7 @@
       @click.prevent="saveLocale(lang.code)"
       :key="lang.code"
       class="pointer pr-2"
-      :class="$store.state.language === lang.code ? 'c-blau' : 'c-grey'"
+      :class="$store.state.language === lang.code ? 'c-grey' : 'c-blau'"
     >
       <span class="locales">{{ lang.name }}</span>
       <span class="ml-3">{{ locales.length - 1 > index ? $t('math.pipe') : '' }}</span>

frontend/src/layouts/AuthLayout.vue

@@ -30,8 +30,8 @@
             </b-row>
             <b-row class="mt-0 mt-md-5 pl-2 pl-md-0 pl-lg-0">
               <b-col lg="9" md="9" sm="12">
-                <div class="h1 mb--2">{{ $t('welcome') }}</div>
-                <div class="h1 mb-0">{{ $t('WelcomeBy', { name: communityName }) }}</div>
+                <div class="mb--2">{{ $t('welcome') }}</div>
+                <div class="h1 mb-0">{{ communityName }}</div>
                 <div class="mb-0">{{ $t('1000thanks') }}</div>
               </b-col>
               <b-col cols="3" class="text-right d-none d-sm-none d-md-inline">

frontend/src/locales/de.json

@@ -288,6 +288,5 @@
     "send_you": "sendet dir"
   },
   "via_link": "über einen Link",
-  "welcome": "Willkommen",
-  "WelcomeBy": "bei {name}"
+  "welcome": "Willkommen in der Gemeinschaft"
 }

frontend/src/locales/en.json

@@ -288,6 +288,5 @@
     "send_you": "wants to send you"
   },
   "via_link": "via Link",
-  "welcome": "Welcome",
-  "WelcomeBy": "by {name}"
+  "welcome": "Welcome to the community"
 }