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' of github.com:gradido/gradido into 1840-refactor-to-filter-object--sub-rename+filters-obj

Browse Source
This commit is contained in:
Wolfgang Huß 2022-06-02 11:22:37 +02:00
commit 8264b18d43
5 changed files with 39 additions and 32 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;
}
.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;

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

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

42
frontend/src/pages/Register.vue
View File

@ -63,29 +63,25 @@
<b-row>
<b-col><input-email v-model="form.email"></input-email></b-col>
</b-row>
<b-row class="mt-4 mb-4">
<b-col class="mb-4 mb-md-0">
<b-form-checkbox
id="registerCheckbox"
v-model="form.agree"
:name="$t('site.signup.agree')"
>
<!-- eslint-disable-next-line @intlify/vue-i18n/no-v-html -->
<span class="text-muted" v-html="$t('site.signup.agree')"></span>
</b-form-checkbox>
</b-col>
<b-col class="d-flex justify-content-end">
<b-button
type="submit"
:disabled="disabled"
:variant="disabled ? 'gradido-disable' : 'gradido'"
>
{{ $t('signup') }}
</b-button>
</b-col>
</b-row>
<div class="my-4">
<b-form-checkbox
id="registerCheckbox"
v-model="form.agree"
:name="$t('site.signup.agree')"
>
<!-- eslint-disable-next-line @intlify/vue-i18n/no-v-html -->
<span class="text-muted" v-html="$t('site.signup.agree')"></span>
</b-form-checkbox>
</div>
<div>
<b-button
type="submit"
:disabled="disabled"
:variant="disabled ? 'gradido-disable' : 'gradido'"
>
{{ $t('signup') }}
</b-button>
</div>
</b-form>
</validation-observer>
</b-container>

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

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