Merge branch 'master' into remove_mariadb_dockerfile

This commit is contained in:
einhornimmond 2024-12-16 19:30:51 +01:00 committed by GitHub
commit 016f920af0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 3 additions and 7 deletions

View File

@ -90,7 +90,6 @@ services:
- 4000:4000
depends_on:
- mariadb
restart: always
environment:
# Envs used in Dockerfile
# - DOCKER_WORKDIR="/app"
@ -126,7 +125,6 @@ services:
# - 5000:5000
depends_on:
- mariadb
restart: always
environment:
# Envs used in Dockerfile
# - DOCKER_WORKDIR="/app"
@ -160,7 +158,6 @@ services:
- external-net
ports:
- 6010:6010
restart: always
environment:
# Envs used in Dockerfile
# - DOCKER_WORKDIR="/app"
@ -194,7 +191,6 @@ services:
- 5010:5010
depends_on:
- mariadb
restart: always
environment:
# Envs used in Dockerfile
# - DOCKER_WORKDIR="/app"

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

View File

@ -23,7 +23,7 @@ import { useAuthLinks } from '@/composables/useAuthLinks'
const { login, register } = useAuthLinks()
const backgroundHeader = '/img/template/gradido_background_header.png'
const logo = '/img/brand/gradido-logo.png'
const logo = '/img/brand/gradido-logo_200x59.png'
const sheet = '/img/template/Blaetter.png'
</script>

View File

@ -30,7 +30,7 @@
<div class="mb-0">{{ $t('1000thanks') }}</div>
</BCol>
<BCol cols="3" class="text-end d-none d-sm-none d-md-inline">
<BAvatar src="/img/brand/gradido_coin.png" size="6rem" />
<BAvatar src="/img/brand/gradido_coin_128x128.png" size="6rem" />
</BCol>
</BRow>
<BCard ref="pageFontSize" no-body class="border-0 mt-4 gradido-custom-background">
@ -62,7 +62,7 @@
<BRow class="d-inline d-sm-inline d-md-none d-lg-none mb-3">
<BCol class="text-center">
<BAvatar
src="/img/brand/gradido_coin.png"
src="/img/brand/gradido_coin_128x128.png"
size="6rem"
bg-variant="transparent"
></BAvatar>