mirror of
https://github.com/IT4Change/gradido.git
synced 2026-02-06 09:56:05 +00:00
Merge branch 'master' into backend_keep_alive
This commit is contained in:
commit
7a05baad2b
@ -92,7 +92,6 @@ services:
|
||||
- 4000:4000
|
||||
depends_on:
|
||||
- mariadb
|
||||
restart: always
|
||||
environment:
|
||||
# Envs used in Dockerfile
|
||||
# - DOCKER_WORKDIR="/app"
|
||||
@ -128,7 +127,6 @@ services:
|
||||
# - 5000:5000
|
||||
depends_on:
|
||||
- mariadb
|
||||
restart: always
|
||||
environment:
|
||||
# Envs used in Dockerfile
|
||||
# - DOCKER_WORKDIR="/app"
|
||||
@ -162,7 +160,6 @@ services:
|
||||
- external-net
|
||||
ports:
|
||||
- 6010:6010
|
||||
restart: always
|
||||
environment:
|
||||
# Envs used in Dockerfile
|
||||
# - DOCKER_WORKDIR="/app"
|
||||
@ -196,7 +193,6 @@ services:
|
||||
- 5010:5010
|
||||
depends_on:
|
||||
- mariadb
|
||||
restart: always
|
||||
environment:
|
||||
# Envs used in Dockerfile
|
||||
# - DOCKER_WORKDIR="/app"
|
||||
|
||||
BIN
frontend/public/img/brand/gradido-logo_200x59.png
Normal file
BIN
frontend/public/img/brand/gradido-logo_200x59.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
BIN
frontend/public/img/brand/gradido_coin_128x128.png
Normal file
BIN
frontend/public/img/brand/gradido_coin_128x128.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 42 KiB |
@ -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>
|
||||
|
||||
|
||||
@ -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>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user