From d1d2ce9565b119103d47ba89d8bc838083b20622 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 1 Jun 2022 07:49:57 +0200 Subject: [PATCH 1/8] fixed redeem link is mobile start false --- frontend/src/pages/TransactionLink.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/pages/TransactionLink.vue b/frontend/src/pages/TransactionLink.vue index 8fb1238b0..5fc20326e 100644 --- a/frontend/src/pages/TransactionLink.vue +++ b/frontend/src/pages/TransactionLink.vue @@ -143,6 +143,7 @@ export default { }, created() { this.setTransactionLinkInformation() + this.$emit('set-mobile-start', false) }, } From 922e44adcded888c195fe0f7f160d88a30bbc75e Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 1 Jun 2022 08:15:13 +0200 Subject: [PATCH 2/8] remove gray box and back link --- frontend/src/pages/ForgotPassword.vue | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/frontend/src/pages/ForgotPassword.vue b/frontend/src/pages/ForgotPassword.vue index eba0eb4e5..dfaa6a038 100644 --- a/frontend/src/pages/ForgotPassword.vue +++ b/frontend/src/pages/ForgotPassword.vue @@ -4,25 +4,18 @@
{{ $t('site.forgotPassword.heading') }}
- - - - - -
- - {{ $t('settings.password.send_now') }} - -
- - - - + + + +
+ + {{ $t('settings.password.send_now') }} + +
+ + -
- {{ $t('back') }} -
Date: Wed, 1 Jun 2022 08:17:20 +0200 Subject: [PATCH 3/8] fixed test, fixed lint --- frontend/src/pages/ForgotPassword.spec.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/frontend/src/pages/ForgotPassword.spec.js b/frontend/src/pages/ForgotPassword.spec.js index 14363633c..af7931793 100644 --- a/frontend/src/pages/ForgotPassword.spec.js +++ b/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 From 4f15e4e3cd0b7397008603290af1e923c3becd79 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 1 Jun 2022 09:44:14 +0200 Subject: [PATCH 4/8] add href for front button link to gradido --- frontend/src/components/Auth/AuthMobileStart.vue | 6 ++++++ frontend/src/layouts/AuthLayout.vue | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/Auth/AuthMobileStart.vue b/frontend/src/components/Auth/AuthMobileStart.vue index 7b11df0f3..09985dd77 100644 --- a/frontend/src/components/Auth/AuthMobileStart.vue +++ b/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; + } +} diff --git a/frontend/src/layouts/AuthLayout.vue b/frontend/src/layouts/AuthLayout.vue index 024d56906..26f8eae85 100644 --- a/frontend/src/layouts/AuthLayout.vue +++ b/frontend/src/layouts/AuthLayout.vue @@ -16,7 +16,9 @@
{{ $t('auth.left.gratitude') }}
{{ $t('auth.left.newCurrency') }}
{{ $t('auth.left.oneAnotherNature') }}
- {{ $t('auth.left.learnMore') }} + + {{ $t('auth.left.learnMore') }} + @@ -118,6 +120,11 @@ export default { this.$refs.pageFontSize.style.fontSize = size + 'rem' }, }, + computed: { + learnMore() { + return 'https://gradido.net/' + this.$i18n.locale + }, + }, } From 8c81d2fe492b9f04f0dff7c1d7596e18114d15e7 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 1 Jun 2022 09:46:26 +0200 Subject: [PATCH 5/8] add button variant from primary to gradido --- frontend/src/pages/ForgotPassword.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/ForgotPassword.vue b/frontend/src/pages/ForgotPassword.vue index dfaa6a038..095920046 100644 --- a/frontend/src/pages/ForgotPassword.vue +++ b/frontend/src/pages/ForgotPassword.vue @@ -8,7 +8,7 @@
- + {{ $t('settings.password.send_now') }}
From cb7e3df9e6b63416a122d334a66a519ac21a0dac Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 1 Jun 2022 10:17:34 +0200 Subject: [PATCH 6/8] learn more button add href and locales --- frontend/src/assets/scss/gradido-template.scss | 18 ++++++++++-------- frontend/src/layouts/AuthLayout.vue | 8 +++++--- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/frontend/src/assets/scss/gradido-template.scss b/frontend/src/assets/scss/gradido-template.scss index 09c8588e9..eb85662fd 100644 --- a/frontend/src/assets/scss/gradido-template.scss +++ b/frontend/src/assets/scss/gradido-template.scss @@ -15,6 +15,15 @@ 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 +41,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; @@ -97,6 +98,7 @@ a:hover, box-shadow: 10px 10px 50px 10px rgb(56 56 56 / 0%); } + .form-control, .custom-select { border-radius: 17px; diff --git a/frontend/src/layouts/AuthLayout.vue b/frontend/src/layouts/AuthLayout.vue index 26f8eae85..a971a6135 100644 --- a/frontend/src/layouts/AuthLayout.vue +++ b/frontend/src/layouts/AuthLayout.vue @@ -16,9 +16,11 @@
{{ $t('auth.left.gratitude') }}
{{ $t('auth.left.newCurrency') }}
{{ $t('auth.left.oneAnotherNature') }}
- - {{ $t('auth.left.learnMore') }} - + + + {{ $t('auth.left.learnMore') }} + + From 7c3cfd508f2156345ccb5fb6c9e783e6ee558187 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 1 Jun 2022 10:18:40 +0200 Subject: [PATCH 7/8] fixed stylelint --- frontend/src/assets/scss/gradido-template.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/frontend/src/assets/scss/gradido-template.scss b/frontend/src/assets/scss/gradido-template.scss index eb85662fd..9d52f0ad9 100644 --- a/frontend/src/assets/scss/gradido-template.scss +++ b/frontend/src/assets/scss/gradido-template.scss @@ -15,7 +15,6 @@ body { color: #0e79bc !important; } - .text-gradido { color: rgb(249 205 105 / 100%); } @@ -98,7 +97,6 @@ a:hover, box-shadow: 10px 10px 50px 10px rgb(56 56 56 / 0%); } - .form-control, .custom-select { border-radius: 17px; From 119b8cdb96eb14fa5cdb67f180bfa81e3ed3009c Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 1 Jun 2022 10:37:32 +0200 Subject: [PATCH 8/8] remove computed learnMore --- frontend/src/layouts/AuthLayout.vue | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/frontend/src/layouts/AuthLayout.vue b/frontend/src/layouts/AuthLayout.vue index a971a6135..c886fd7f9 100644 --- a/frontend/src/layouts/AuthLayout.vue +++ b/frontend/src/layouts/AuthLayout.vue @@ -16,7 +16,7 @@
{{ $t('auth.left.gratitude') }}
{{ $t('auth.left.newCurrency') }}
{{ $t('auth.left.oneAnotherNature') }}
- + {{ $t('auth.left.learnMore') }} @@ -122,11 +122,6 @@ export default { this.$refs.pageFontSize.style.fontSize = size + 'rem' }, }, - computed: { - learnMore() { - return 'https://gradido.net/' + this.$i18n.locale - }, - }, }