1
0

Merge branch 'main' into vue3

# 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
120 changed files with 717 additions and 272 deletions

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;