Merge branch 'main' into dev
This commit is contained in:
@@ -69,7 +69,7 @@ onMount(fetchModules);
|
||||
<a href="/wiki" {onclick} class="wiki">{t('wiki')}</a>
|
||||
<a href="/contact" {onclick} class="contact">{t('contacts')}</a>
|
||||
<a href="/stock" {onclick} class="stock">{t('stock')}</a>
|
||||
<a href="/message" {onclick} class="message">{t('messages')}</a>
|
||||
<a href="/message" {onclick} class="message">{@html t('messages')}</a>
|
||||
{#if user.id == 2}
|
||||
<a href="https://svelte.dev/tutorial/svelte/state" target="_blank">{t('tutorial')}</a>
|
||||
{/if}
|
||||
|
||||
@@ -62,7 +62,7 @@
|
||||
</script>
|
||||
|
||||
<fieldset>
|
||||
<legend>{t('messages')} <button onclick={showSettings}>{t('settings')}</button></legend>
|
||||
<legend>{@html t('messages')} <button onclick={showSettings}>{t('settings')}</button></legend>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
|
||||
@@ -210,7 +210,7 @@
|
||||
"member": "Mitarbeiter",
|
||||
"members": "Mitarbeiter",
|
||||
"message": "Nachricht",
|
||||
"messages": "Benachrichtigungen",
|
||||
"messages": "Be­nach­rich­ti­gung­en",
|
||||
"miscellaneous_settings": "sonstige Einstellungen",
|
||||
"missing_new_item_id": "Alter Artikel-ID ({0}) wurde keine neue ID zugeordnet!",
|
||||
"mismatch": "ungleich",
|
||||
|
||||
@@ -142,16 +142,6 @@ td, tr{
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
.settings {
|
||||
position: fixed;
|
||||
top: 60px;
|
||||
left: 10px;
|
||||
right: 10px;
|
||||
padding: 10px;
|
||||
border: 1px solid;
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
.project.list td:not(.actions){
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
@@ -225,16 +225,6 @@ td, tr{
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
.settings {
|
||||
position: fixed;
|
||||
top: 60px;
|
||||
left: 10px;
|
||||
right: 10px;
|
||||
padding: 10px;
|
||||
border: 1px solid;
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
.project.list td:not(.actions){
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
@@ -142,16 +142,6 @@ td, tr{
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
.settings {
|
||||
position: fixed;
|
||||
top: 60px;
|
||||
left: 10px;
|
||||
right: 10px;
|
||||
padding: 10px;
|
||||
border: 1px solid;
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
.project.list td:not(.actions){
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user