ami/tl-vikunja
1
0
Fork 0
Code Activity

Merge branch 'main' into vue3

Browse Source 
# Conflicts:
#	src/components/tasks/mixins/createTask.js
This commit is contained in:
kolaente
2021-10-17 13:37:20 +02:00
parent 6f51921588 e52c139c9f
commit 1d2abf56f9
9 changed files with 211 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,6 +72,7 @@ $filter-container-height: '1rem - #{$switch-view-height}';
margin: .5rem;
border-radius: $radius;
background: $task-background;
padding-bottom: .125rem;
&.loader-container.is-loading:after {
width: 1.5rem;
@ -122,6 +123,7 @@ $filter-container-height: '1rem - #{$switch-view-height}';
.tag, .assignees, .icon, .priority-label, .checklist-summary {
margin-top: 0;
margin-right: .25rem;
margin-bottom: .25rem;
}
.checklist-summary {

40
src/styles/components/tasks.scss
View File

@ -15,8 +15,31 @@
}
}
&.has-task-edit-open {
flex-direction: column;
@media screen and (min-width: $tablet) {
flex-direction: row;
.tasks {
width: 66%;
}
}
}
.taskedit {
width: 50%;
width: 33%;
margin-right: 1rem;
margin-left: .5rem;
@media screen and (max-width: $tablet) {
width: 100%;
border-radius: 0;
margin: 0;
border-left: 0;
border-right: 0;
border-bottom: 0;
}
}
}
@ -25,16 +48,6 @@
padding: 0;
text-align: left;
@media screen and (min-width: $tablet) {
&.short {
max-width: 53vw;
}
}
@media screen and (max-width: $tablet) {
max-width: 100%;
}
&.noborder {
margin: 1rem -0.5rem;
}
@ -195,7 +208,7 @@
border-bottom-color: $grey-300;
}
}
.checklist-summary {
padding-left: .5rem;
font-size: .9rem;
@ -235,9 +248,6 @@
}
.taskedit {
min-height: calc(100% - 1rem);
margin-top: 1rem;
.priority-select {
.select, select {
width: 100%;