diff --git a/backend/src/emails/templates/accountActivation/html.pug b/backend/src/emails/templates/accountActivation/html.pug index fd976a643..6b5dd41c3 100644 --- a/backend/src/emails/templates/accountActivation/html.pug +++ b/backend/src/emails/templates/accountActivation/html.pug @@ -2,7 +2,7 @@ extend ../layout.pug block content if logoUrl - img(src=logoUrl, alt="Banner", style="max-width: 680px; max-height: 250px;") + img(src=logoUrl, alt="Banner", style="max-width: 680px; max-height: 250px;border-radius:20px") h2= t('emails.accountActivation.title') .text-block include ../includes/salutation.pug diff --git a/frontend/src/assets/scss/gradido-template.scss b/frontend/src/assets/scss/gradido-template.scss index 11edb33a8..9464525ec 100644 --- a/frontend/src/assets/scss/gradido-template.scss +++ b/frontend/src/assets/scss/gradido-template.scss @@ -376,9 +376,3 @@ input.rounded-input { font-family: inherit !important; font-weight: normal !important; } - -@media (max-width: 576px) { - .col-xs-10 { - width: 83.33333333%; - } -} diff --git a/frontend/src/layouts/AuthLayout.vue b/frontend/src/layouts/AuthLayout.vue index cae905c11..74d7abced 100644 --- a/frontend/src/layouts/AuthLayout.vue +++ b/frontend/src/layouts/AuthLayout.vue @@ -74,7 +74,7 @@ + + + {{ $t('missingGradidoAccount', { communityName: CONFIG.COMMUNITY_NAME }) }} + + + + + + {{ $t('signup') }} + + + @@ -58,6 +70,8 @@ import { useRouter, useRoute } from 'vue-router' import { useForm } from 'vee-validate' import { useMutation, useLazyQuery } from '@vue/apollo-composable' import { useAppToast } from '@/composables/useToast' +import { useAuthLinks } from '@/composables/useAuthLinks' +import CONFIG from '@/config' // import { useLoading } from 'vue-loading-overlay' const router = useRouter() @@ -68,6 +82,7 @@ const { mutate } = useMutation(login) const { load } = useLazyQuery(authenticateHumhubAutoLoginProject) // const $loading = useLoading() // TODO needs to be updated but there is some sort of an issue that breaks the app. const { toastError } = useAppToast() +const { register } = useAuthLinks() const form = ref({ email: '', @@ -146,4 +161,7 @@ const enterData = computed(() => !showPageMessage.value) padding-right: 0; padding-left: 0; } +a.register-nav-item { + color: #0e79bc !important; +} diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue index e7f8b39b3..6feb1e9fe 100755 --- a/frontend/src/pages/Register.vue +++ b/frontend/src/pages/Register.vue @@ -70,6 +70,18 @@ + + + {{ $t('existingGradidoAccount', { communityName: CONFIG.COMMUNITY_NAME }) }} + + + + + + + @@ -89,8 +101,11 @@ import { createUser } from '@/graphql/mutations' import { useI18n } from 'vue-i18n' import { useStore } from 'vuex' import { useRoute } from 'vue-router' +import { useAuthLinks } from '@/composables/useAuthLinks' +import CONFIG from '@/config' const { toastError } = useAppToast() +const { login } = useAuthLinks() const { mutate } = useMutation(createUser) @@ -151,4 +166,7 @@ async function onSubmit() { padding-right: 0; padding-left: 0; } +a.login-nav-item { + color: #0e79bc !important; +}