diff --git a/frontend/src/Components/LineEditor.svelte b/frontend/src/Components/LineEditor.svelte index 247aa3b..68c9243 100644 --- a/frontend/src/Components/LineEditor.svelte +++ b/frontend/src/Components/LineEditor.svelte @@ -83,5 +83,5 @@ {#if editable && editing} {:else} -{value} +{value} {/if} diff --git a/frontend/src/Components/Menu.svelte b/frontend/src/Components/Menu.svelte index a0fd633..8d25480 100644 --- a/frontend/src/Components/Menu.svelte +++ b/frontend/src/Components/Menu.svelte @@ -32,12 +32,13 @@ onMount(fetchModules); \ No newline at end of file + diff --git a/frontend/src/routes/project/List.svelte b/frontend/src/routes/project/List.svelte index b362c6f..04878cc 100644 --- a/frontend/src/routes/project/List.svelte +++ b/frontend/src/routes/project/List.svelte @@ -85,15 +85,16 @@ {#each sortedProjects as project} - show(project.id)} > - {project.name} + + show(project.id)}>{project.name} - show(project.id)} > + show(project.id)} > {#if project.company_id && companies[project.company_id]} {companies[project.company_id].name} {/if} show(project.id)} > + {t("state_"+project.status.name.toLowerCase())} show(project.id)} > @@ -115,4 +116,4 @@ {/if} - \ No newline at end of file + diff --git a/frontend/src/routes/task/ListTask.svelte b/frontend/src/routes/task/ListTask.svelte index b7da79f..b4c59f7 100644 --- a/frontend/src/routes/task/ListTask.svelte +++ b/frontend/src/routes/task/ListTask.svelte @@ -88,7 +88,7 @@ {#if !deleted}
  • - + {#if task.estimated_time} ({+task.estimated_time} h) {/if} @@ -116,4 +116,4 @@ {/if}
  • -{/if} \ No newline at end of file +{/if} diff --git a/frontend/src/routes/task/View.svelte b/frontend/src/routes/task/View.svelte index 36d0556..cb3c96a 100644 --- a/frontend/src/routes/task/View.svelte +++ b/frontend/src/routes/task/View.svelte @@ -162,7 +162,7 @@ {#if project} {t('project')} - {project.name} + {project.name} {/if} {#if task.parent} @@ -300,4 +300,4 @@

    {t('notes')}

    -
    \ No newline at end of file + diff --git a/web/src/main/resources/web/css/default.css b/web/src/main/resources/web/css/default.css index cd80677..758d7e7 100644 --- a/web/src/main/resources/web/css/default.css +++ b/web/src/main/resources/web/css/default.css @@ -5,6 +5,7 @@ a { color: orange; + text-decoration: none; } body { font-family: sans; @@ -83,20 +84,20 @@ td, tr{ background: rgba(0,0,0,0.7); backdrop-filter: blur(3px); } -.task.cancelled > span { +.task.cancelled > a { text-decoration: line-through; color: gray; } -.task.started > span { +.task.started > a { color: chartreuse; } -.task.pending > span { +.task.pending > a { color: gray; } -.task.complete > span { +.task.complete > a { color: forestgreen; } -.task.complete > span:before { +.task.complete > a:before { content: "✓ "; } @@ -230,4 +231,4 @@ textarea{ background: transparent; color: orange; border: 0 none; -} \ No newline at end of file +}