SRSoftware/Umbrella
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse Source
This commit is contained in:
Stephan Richter
2025-10-17 13:08:30 +02:00
parent 6195736dc3 0a7c59443b
commit d657d64d1f
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/Components/MarkdownEditor.svelte
View File

@@ -124,7 +124,7 @@
<textarea bind:value={editValue.source} onkeyup={typed} autofocus={!simple}></textarea> <textarea bind:value={editValue.source} onkeyup={typed} autofocus={!simple}></textarea>
<span class="buttons"> <span class="buttons">
<button class="cancel" onclick={e => editing = false}>{t('cancel')}</button> <button class="cancel" onclick={e => editing = false}>{t('cancel')}</button>
<span>{t('markdown_supported')}</span> <span>{@html t('markdown_supported')}</span>
<button class="save" onclick={doSave}>{t('save')}</button> <button class="save" onclick={doSave}>{t('save')}</button>
</span> </span>
</div> </div>

2
translations/src/main/resources/de.json
View File

@@ -140,7 +140,7 @@
"logout_user": "{user} abmelden", "logout_user": "{user} abmelden",
"markdown_code": "Markdown-Code", "markdown_code": "Markdown-Code",
"markdown_supported": "Markdown & Plantuml nutzbar!", "markdown_supported": "Markdown & <a href=\"https://plantuml.com\">Plantuml</a> nutzbar!",
"MANAGE_LOGIN_SERVICES": "Login-Services verwalten", "MANAGE_LOGIN_SERVICES": "Login-Services verwalten",
"member": "Mitarbeiter", "member": "Mitarbeiter",
"members": "Mitarbeiter", "members": "Mitarbeiter",

2
translations/src/main/resources/en.json
View File

@@ -139,7 +139,7 @@
"logout_user": "logout {user}", "logout_user": "logout {user}",
"markdown_code": "Markdown-Code", "markdown_code": "Markdown-Code",
"markdown_supported": "Markdown & Plantuml supported!", "markdown_supported": "Markdown & <a href=\"https://plantuml.com\">Plantuml</a> supported!",
"MANAGE_LOGIN_SERVICES": "manage login services", "MANAGE_LOGIN_SERVICES": "manage login services",
"member": "member", "member": "member",
"members": "members", "members": "members",

2
web/src/main/resources/web/css/default-color.css
View File

@@ -87,7 +87,7 @@ textarea{
.kanban .state_10 .box, .kanban .state_10 .box,
.kanban .state_100 .box{ .kanban .state_100 .box{
background: linear-gradient(rgba(0,0,0,0.8)); background: linear-gradient(rgba(0,0,0,0.6));
} }
.kanban .state_10 .box, .kanban .state_10 .box,