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' into refactor-deny-contribution-unit-test

Browse Source
This commit is contained in:
Hannes Heine 2023-02-03 08:26:15 +01:00 committed by GitHub
commit d7ab077128
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/emails/sendEmailTranslated.ts
View File

@ -4,6 +4,7 @@ import path from 'path'
import { createTransport } from 'nodemailer' import { createTransport } from 'nodemailer'
import Email from 'email-templates' import Email from 'email-templates'
import i18n from 'i18n' import i18n from 'i18n'
import LogError from '@/server/LogError'
export const sendEmailTranslated = async (params: { export const sendEmailTranslated = async (params: {
receiver: { receiver: {
@ -73,8 +74,7 @@ export const sendEmailTranslated = async (params: {
logger.info('Result: ', result) logger.info('Result: ', result)
}) })
.catch((error: unknown) => { .catch((error: unknown) => {
logger.error('Error sending notification email: ', error) throw new LogError('Error sending notification email', error)
throw new Error('Error sending notification email!')
}) })
i18n.setLocale(rememberLocaleToRestore) i18n.setLocale(rememberLocaleToRestore)

19
frontend/src/components/Menu/Sidebar.vue
View File

@ -78,7 +78,24 @@ export default {
min-width: 200px; min-width: 200px;
} }
@media screen and (max-width: 1024px) { @media screen and (min-width: 1025px) {
#side-menu {
max-width: 180px;
}
#component-sidebar {
min-width: 180px;
}
}
@media screen and (min-width: 1075px) {
#side-menu {
max-width: 200px;
}
#component-sidebar {
min-width: 200px;
}
}
@media screen and (max-width: 1108px) {
#side-menu { #side-menu {
max-width: 100%; max-width: 100%;
} }