IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
clauspeterhuebner 2022-06-02 02:35:44 +02:00 committed by GitHub
commit 05ef8f26ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 30 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
frontend/src/assets/scss/gradido-template.scss
View File

@ -15,6 +15,14 @@ body {
color: #0e79bc !important; 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 */ /* Navbar */
a, a,
.navbar-light, .navbar-light,
@ -32,14 +40,6 @@ a:hover,
color: rgb(35 121 188 / 90%); 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 */ /* Button */
.btn { .btn {
border-radius: 25px; border-radius: 25px;

6
frontend/src/components/Auth/AuthMobileStart.vue
View File

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

6
frontend/src/layouts/AuthLayout.vue
View File

@ -16,7 +16,11 @@
<div class="h0 text-white">{{ $t('auth.left.gratitude') }}</div> <div class="h0 text-white">{{ $t('auth.left.gratitude') }}</div>
<div class="h1 text-white">{{ $t('auth.left.newCurrency') }}</div> <div class="h1 text-white">{{ $t('auth.left.newCurrency') }}</div>
<div class="h2 text-white">{{ $t('auth.left.oneAnotherNature') }}</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>
</div> </div>
<b-row class="justify-content-md-center"> <b-row class="justify-content-md-center">

10
frontend/src/pages/ForgotPassword.spec.js
View File

@ -50,16 +50,6 @@ describe('ForgotPassword', () => {
expect(wrapper.find('div.forgot-password').exists()).toBe(true) 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', () => { describe('input form', () => {
let form let form

27
frontend/src/pages/ForgotPassword.vue
View File

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

1
frontend/src/pages/TransactionLink.vue
View File

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