ami/tl-vikunja
1
0
Fork 0
Code Activity

Merge branch 'main' into vue3

Browse Source 
# Conflicts:
#	src/components/input/editor.vue
#	src/components/list/partials/filters.vue
#	src/components/tasks/partials/editAssignees.vue
#	src/helpers/find.ts
#	src/helpers/time/formatDate.js
#	src/main.ts
#	src/store/modules/attachments.js
#	src/store/modules/kanban.js
#	src/views/list/views/List.vue
#	yarn.lock
This commit is contained in:
Dominik Pschenitschni
2021-10-07 12:20:52 +02:00
parent 66648be6d5 faa2daa876
commit 3a7a4bdc42
120 changed files with 717 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/styles/components/kanban.scss
View File

@ -117,11 +117,16 @@ $filter-container-height: '1rem - #{$switch-view-height}';
display: flex;
flex-wrap: wrap;
align-items: center;
margin-top: .25rem;
.tag, .assignees, .icon, .priority-label {
margin-top: .25rem;
.tag, .assignees, .icon, .priority-label, .checklist-summary {
margin-top: 0;
margin-right: .25rem;
}
.checklist-summary {
padding-left: 0;
}
.assignees {
display: flex;
@ -142,7 +147,7 @@ $filter-container-height: '1rem - #{$switch-view-height}';
.priority-label {
font-size: .75rem;
height: 2rem;
height: 1.5rem;
.icon {
height: 1rem;

2
src/styles/theme/content.scss
View File

@ -35,7 +35,7 @@
}
.no-auth-wrapper {
background: url('/images/llama.svg') no-repeat bottom left fixed $light-background;
background: url('@/assets/llama.svg') no-repeat bottom left fixed $light-background;
min-height: 100vh;
.noauth-container {

3
src/styles/theme/offline.scss
View File

@ -1,6 +1,5 @@
.offline {
background: url('/images/llama-nightscape.png') no-repeat center;
-webkit-background-size: cover;
background: url('@/assets/llama-nightscape.jpg') no-repeat center;
background-size: cover;
height: 100vh;