Merge branch 'master' into 1881-set-role-in-admin-interface

This commit is contained in:
Wolfgang Huß 2022-06-21 10:44:28 +02:00 committed by GitHub
commit 4692338d09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 5 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 81 KiB

After

Width:  |  Height:  |  Size: 673 KiB

View File

@ -3,7 +3,7 @@
<b-navbar toggleable="lg" class="pr-4">
<b-navbar-brand>
<b-img
class="imgLogo position-absolute ml--3 mt--3 p-2 zindex1000"
class="imgLogo position-absolute ml--3 mt-lg--2 mt-3 p-2 zindex1000"
:src="logo"
width="200"
alt="..."
@ -18,7 +18,7 @@
<b-img class="sheet-img position-absolute d-block d-lg-none zindex1000" :src="sheet"></b-img>
<b-navbar-toggle target="nav-collapse" class="zindex1000"></b-navbar-toggle>
<b-collapse id="nav-collapse" is-nav class="mt-5 mt-lg-0">
<b-collapse id="nav-collapse" is-nav class="ml-5">
<b-navbar-nav class="ml-auto" right>
<b-nav-item :href="`https://gradido.net/${$i18n.locale}`" target="_blank">
{{ $t('auth.navbar.aboutGradido') }}
@ -49,10 +49,18 @@ export default {
color: #383838 !important;
}
.navbar-toggler {
font-size: 2.25rem;
}
.authNavbar > .router-link-exact-active {
color: #0e79bc !important;
}
button.navbar-toggler > span.navbar-toggler-icon {
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba(4, 112, 6, 1)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
}
.auth-header {
font-family: 'Open Sans', sans-serif !important;
}

View File

@ -4,7 +4,7 @@
v-for="(lang, index) in locales"
@click.prevent="saveLocale(lang.code)"
:key="lang.code"
class="pointer pr-3"
class="pointer pr-2"
:class="$store.state.language === lang.code ? 'c-blau' : 'c-grey'"
>
<span class="locales">{{ lang.name }}</span>

View File

@ -31,8 +31,8 @@
<auth-navbar-small />
</b-col>
</b-row>
<b-row class="mt-5 pl-2 pl-md-0 pl-lg-0">
<b-col cols="9">
<b-row class="mt-0 mt-md-5 pl-2 pl-md-0 pl-lg-0">
<b-col lg="9" md="9" sm="12">
<div class="h1 mb--2">{{ $t('welcome') }}</div>
<div class="h1 mb-0">{{ $t('WelcomeBy', { name: communityName }) }}</div>
<div class="mb-0">{{ $t('1000thanks') }}</div>