Merge branch 'master' into 1906-feature-concept-for-gdd-creation-per-linkqr-code

frontend/src/assets/scss/gradido-template.scss

@@ -15,6 +15,14 @@ body {
   color: #0e79bc !important;
 }
 
+.text-gradido {
+  color: rgb(249 205 105 / 100%);
+}
+
+.gradient-gradido {
+  background-image: linear-gradient(146deg, rgb(220 167 44) 50%, rgb(197 141 56 / 100%) 100%);
+}
+
 /* Navbar  */
 a,
 .navbar-light,
@@ -32,14 +40,6 @@ a:hover,
   color: rgb(35 121 188 / 90%);
 }
 
-.text-gradido {
-  color: rgb(249 205 105 / 100%);
-}
-
-.gradient-gradido {
-  background-image: linear-gradient(146deg, rgb(220 167 44) 50%, rgb(197 141 56 / 100%) 100%);
-}
-
 /* Button */
 .btn {
   border-radius: 25px;

frontend/src/components/Auth/AuthMobileStart.vue

@@ -124,4 +124,10 @@ export default {
     min-width: 360px;
   }
 }
+
+@media screen and (max-height: 700px) {
+  .mobil-start-box #img3 {
+    top: -104px;
+  }
+}
 </style>

frontend/src/layouts/AuthLayout.vue

@@ -16,7 +16,11 @@
           <div class="h0 text-white">{{ $t('auth.left.gratitude') }}</div>
           <div class="h1 text-white">{{ $t('auth.left.newCurrency') }}</div>
           <div class="h2 text-white">{{ $t('auth.left.oneAnotherNature') }}</div>
-          <b-button variant="gradido">{{ $t('auth.left.learnMore') }}</b-button>
+          <b-link :href="`https://gradido.net/${$i18n.locale}`" target="_blank">
+            <b-button variant="gradido">
+              {{ $t('auth.left.learnMore') }}
+            </b-button>
+          </b-link>
         </div>
       </div>
       <b-row class="justify-content-md-center">

frontend/src/pages/ForgotPassword.spec.js

@@ -50,16 +50,6 @@ describe('ForgotPassword', () => {
       expect(wrapper.find('div.forgot-password').exists()).toBe(true)
     })
 
-    describe('back button', () => {
-      it('has a "back" button', () => {
-        expect(wrapper.findComponent(RouterLinkStub).text()).toEqual('back')
-      })
-
-      it('links to login', () => {
-        expect(wrapper.findComponent(RouterLinkStub).props().to).toEqual('/login')
-      })
-    })
-
     describe('input form', () => {
       let form
 

frontend/src/pages/ForgotPassword.vue

@@ -4,25 +4,18 @@
       <div class="pb-5">{{ $t('site.forgotPassword.heading') }}</div>
       <b-row class="justify-content-center">
         <b-col>
-          <b-card no-body class="border-0 gradido-custom-background">
-            <b-card-body class="p-4">
-              <validation-observer ref="observer" v-slot="{ handleSubmit }">
-                <b-form role="form" @submit.prevent="handleSubmit(onSubmit)">
-                  <input-email v-model="form.email"></input-email>
-                  <div class="text-center">
-                    <b-button type="submit" variant="primary">
-                      {{ $t('settings.password.send_now') }}
-                    </b-button>
-                  </div>
-                </b-form>
-              </validation-observer>
-            </b-card-body>
-          </b-card>
+          <validation-observer ref="observer" v-slot="{ handleSubmit }">
+            <b-form role="form" @submit.prevent="handleSubmit(onSubmit)">
+              <input-email v-model="form.email"></input-email>
+              <div class="text-center">
+                <b-button type="submit" variant="gradido">
+                  {{ $t('settings.password.send_now') }}
+                </b-button>
+              </div>
+            </b-form>
+          </validation-observer>
         </b-col>
       </b-row>
-      <div class="text-center py-lg-4">
-        <router-link to="/login" class="mt-3">{{ $t('back') }}</router-link>
-      </div>
     </b-container>
     <b-container v-else>
       <message

frontend/src/pages/TransactionLink.vue

@@ -143,6 +143,7 @@ export default {
   },
   created() {
     this.setTransactionLinkInformation()
+    this.$emit('set-mobile-start', false)
   },
 }
 </script>