Browse Source

Merge branch 'main' into dev

module/document
Stephan Richter 3 weeks ago
parent
commit
d657d64d1f
  1. 2
      frontend/src/Components/MarkdownEditor.svelte
  2. 2
      translations/src/main/resources/de.json
  3. 2
      translations/src/main/resources/en.json
  4. 2
      web/src/main/resources/web/css/default-color.css

2
frontend/src/Components/MarkdownEditor.svelte

@ -124,7 +124,7 @@ @@ -124,7 +124,7 @@
<textarea bind:value={editValue.source} onkeyup={typed} autofocus={!simple}></textarea>
<span class="buttons">
<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>
</span>
</div>

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

@ -140,7 +140,7 @@ @@ -140,7 +140,7 @@
"logout_user": "{user} abmelden",
"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",
"member": "Mitarbeiter",
"members": "Mitarbeiter",

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

@ -139,7 +139,7 @@ @@ -139,7 +139,7 @@
"logout_user": "logout {user}",
"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",
"member": "member",
"members": "members",

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

@ -87,7 +87,7 @@ textarea{ @@ -87,7 +87,7 @@ textarea{
.kanban .state_10 .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,

Loading…
Cancel
Save