Skip to content

Update the design of the task list #1136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raimund-schluessler merged 17 commits into from
Jul 27, 2020
Merged

Update the design of the task list #1136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
a516895
Update the design as discussed in issue #664
timkrief Jul 21, 2020
d3d3555
Made lines straight between two rows on the same level
timkrief Jul 21, 2020
2d6377b
Fixed tasks with hidden subtasks styling
timkrief Jul 21, 2020
aaf8a3a
Removed a CSS property that wasn't useful anymore.
timkrief Jul 21, 2020
745e50b
Fixed an edge case for the style of the last element
timkrief Jul 21, 2020
866bf66
Fixed tasklist overlapping menu.
timkrief Jul 21, 2020
3c4672a
Fix SCSS style issues
raimund-schluessler Jul 23, 2020
ed3ab32
Adjust checkbox css, also style details checkbox
raimund-schluessler Jul 23, 2020
b96b56a
Adjust box-shadow
raimund-schluessler Jul 23, 2020
2f53604
Revert change to hovered and active task
raimund-schluessler Jul 23, 2020
30ab3d3
Better calculate if border radius should be shown
raimund-schluessler Jul 25, 2020
8c911b9
Adjust app sidebar title background color
raimund-schluessler Jul 25, 2020
1af0390
Show correct corner for input of last task in tree
raimund-schluessler Jul 27, 2020
17e34eb
Don't show round corners for task items on mobile
raimund-schluessler Jul 27, 2020
1523b33
Don't highlight checkboxes on hover
raimund-schluessler Jul 27, 2020
812a5cd
Correctly align task checkboxes
raimund-schluessler Jul 27, 2020
3b5d6b2
Fix style issue
raimund-schluessler Jul 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
185 changes: 152 additions & 33 deletions css/src/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,11 +248,13 @@ $blue_due: #4271a6; // due dates and low importance
}

.app-content {
background-color: var(--color-background-dark) !important;

.header {
padding: 12px 15px 12px 44px;
position: sticky;
top: 50px;
background-color: var(--color-main-background-translucent);
background-color: var(--color-background-dark);
z-index: 1000;
display: flex;

Expand All @@ -263,6 +265,10 @@ $blue_due: #4271a6; // due dates and low importance
.add-task {
position: relative;
width: calc(100% - 44px);

input {
box-shadow: 0 0 1px var(--color-box-shadow);
}
}

.sortorder {
Expand Down Expand Up @@ -372,26 +378,21 @@ $blue_due: #4271a6; // due dates and low importance
}
}

.add-task {
border: 1px solid var(--color-border-dark);

input {
border: medium none !important;
border-radius: 0 !important;
box-shadow: none !important;
box-sizing: border-box;
color: var(--color-main-text);
cursor: text;
font-size: 100%;
margin: 0;
padding: 0 15px;
width: 100%;
min-height: 44px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
outline: none;
}
.add-task input {
border: medium none !important;
box-sizing: border-box;
color: var(--color-main-text);
cursor: text;
font-size: 100%;
margin: 0;
padding: 0 15px;
width: 100%;
min-height: 44px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
outline: none;
border-radius: var(--border-radius);
}

> div {
Expand All @@ -414,8 +415,8 @@ $blue_due: #4271a6; // due dates and low importance

span {
color: var(--color-text-lighter);
background-color: var(--color-background-dark);
border-radius: 10px;
background-color: var(--color-main-background);
border-radius: var(--border-radius-pill);
padding: 3px 6px;

&:hover {
Expand All @@ -429,13 +430,38 @@ $blue_due: #4271a6; // due dates and low importance
position: relative;
padding-top: 2px;

> ol {
filter: drop-shadow(0 0 1px var(--color-box-shadow));
z-index: 1;

&:hover {
z-index: 10;
}

// Show round corners for first root task
> .task-item {
&:first-child > .task-body {
border-top-left-radius: var(--border-radius);
border-top-right-radius: var(--border-radius);
border-top: none;
}

& > .task-body {
@media only screen and (max-width: $breakpoint-mobile) {
border-radius: 0 !important;
}
}
}
}

.task-item {
cursor: default;
list-style: none outside none;
margin-top: -1px;

&.done .task-body {
opacity: .6;
.task-info {
opacity: .6;
}

.title {
text-decoration: line-through;
Expand All @@ -446,9 +472,50 @@ $blue_due: #4271a6; // due dates and low importance
opacity: .6;
}

&.sortable-ghost .task-body {
// background-color: rgba( $color-primary, .1 ); didn't work for some reason
background-color: transparentize( $color-primary, .9 );
&.sortable-ghost {
filter: drop-shadow(0 0 3px var(--color-primary));
z-index: 5;
}

&.add-task {
border-top: 1px solid var(--color-border);

input {
border-top-left-radius: 0;
border-top-right-radius: 0;
}
}

// Show round corners if a task is the last in the (sub-)list
&:last-child .task-body {
border-bottom-left-radius: var(--border-radius);
border-bottom-right-radius: var(--border-radius);
}

// Don't show round corners if any of the ancestors is not the last in the (sub-)list
&:not(:last-child) {
&.add-task input,
.add-task input {
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}
.task-body {
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}
}

// If the subtasks container is visible, show a round corner for the task itself and
// the next task in the list
&.container-visible {
& > .task-body {
border-bottom-left-radius: var(--border-radius);
border-bottom-right-radius: 0;
}

& + .task-item > .task-body {
border-top-left-radius: var(--border-radius);
}
}

.subtasks-container {
Expand All @@ -462,7 +529,8 @@ $blue_due: #4271a6; // due dates and low importance
align-items: center;
height: 44px;
position: relative;
border: 1px solid var(--color-border-dark);
background-color: var(--color-main-background);
border-top: 1px solid var(--color-border);

&:hover {
background-color: var(--color-background-hover);
Expand All @@ -473,10 +541,33 @@ $blue_due: #4271a6; // due dates and low importance
}

.task-checkbox {
padding: 11px;
padding: 11px 10px;
height: 44px;
width: 44px;
opacity: .5;

input[type='checkbox'].checkbox + label {
&::before {
border-width: 2px;
border-radius: var(--border-radius);
border-color: var(--color-border-dark);
}

&:hover {
border-color: var(--color-border-dark);
}

&.priority-high::before {
border-color: $red_overdue;
}

&.priority-medium::before {
border-color: $yellow;
}

&.priority-low::before {
border-color: $blue_due;
}
}
}

.task-info {
Expand Down Expand Up @@ -768,7 +859,7 @@ $blue_due: #4271a6; // due dates and low importance
flex: 0 0 auto;
display: flex;
align-items: center;
background-color: var(--color-background-dark);
background-color: var(--color-background-hover);
border-bottom: 1px solid var(--color-border-dark);
font-size: 16px;
font-weight: bold;
Expand All @@ -787,7 +878,30 @@ $blue_due: #4271a6; // due dates and low importance

.detail-checkbox {
padding: 11px 10px;
opacity: .5;

input[type='checkbox'].checkbox + label {
&::before {
border-width: 2px;
border-radius: var(--border-radius);
border-color: var(--color-border-dark);
}

&:hover {
border-color: var(--color-border-dark);
}

&.priority-high::before {
border-color: $red_overdue;
}

&.priority-medium::before {
border-color: $yellow;
}

&.priority-low::before {
border-color: $blue_due;
}
}
}

.title-wrapper {
Expand Down Expand Up @@ -1140,6 +1254,11 @@ $blue_due: #4271a6; // due dates and low importance
label {
padding-left: 14px;
width: 100%;

&::before {
border-width: 2px;
border-radius: var(--border-radius);
}
}

div,
Expand Down
30 changes: 23 additions & 7 deletions src/components/TaskBody.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,13 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
<template>
<li v-show="showTask"
:task-id="task.uri"
:class="{done: task.completed, readOnly: readOnly, deleted: !!deleteTimeout}"
:class="{
done: task.completed,
readOnly: readOnly,
deleted: !!deleteTimeout,
subtasksHidden: !showSubtasks,
'container-visible': ((showSubtasks && filteredSubtasks.length) || showSubtaskInput)
}"
:data-priority="[task.priority]"
class="task-item"
@dragstart="dragStart($event)">
Expand All @@ -44,7 +50,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
:disabled="readOnly"
:aria-label="$t('tasks', 'Task is completed')"
@click="toggleCompleted(task)">
<label class="reactive no-nav" :for="'toggleCompleted_' + task.uid" />
<label :class="[checkboxColor, 'reactive no-nav']" :for="'toggleCompleted_' + task.uid" />
</div>
<!-- Info: title, progress & categories -->
<div class="task-info">
Expand Down Expand Up @@ -293,18 +299,28 @@ export default {
}
},

iconStar() {
priorityClass() {
if (+this.task.priority > 5) {
return 'sprt-color sprt-task-star-low'
return 'low'
} else if (+this.task.priority === 5) {
return 'sprt-color sprt-task-star-medium'
return 'medium'
} else if (+this.task.priority > 0 && +this.task.priority < 5) {
return 'sprt-color sprt-task-star-high'
return 'high'
} else {
return 'icon-sprt-bw sprt-task-star'
return ''
}
},

checkboxColor() {
const priority = this.priorityClass
return priority ? `priority-${priority}` : ''
},

iconStar() {
const priority = this.priorityClass
return priority ? `sprt-color sprt-task-star-${priority}` : 'icon-sprt-bw sprt-task-star'
},

hasCompletedSubtasks() {
return Object.values(this.task.subTasks).some(subTask => {
return subTask.completed
Expand Down
3 changes: 2 additions & 1 deletion src/components/TaskDragContainer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
-->

<template>
<draggable tag="ol"
<draggable v-if="sortedTasks.length"
tag="ol"
:list="['']"
:set-data="setDragData"
v-bind="{group: 'tasks', swapThreshold: 0.30, delay: 500, delayOnTouchOnly: true, touchStartThreshold: 3, disabled: disabled, filter: '.readOnly'}"
Expand Down
6 changes: 5 additions & 1 deletion src/components/TheDetails.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
:disabled="readOnly"
:aria-label="$t('tasks', 'Task is completed')"
@click="toggleCompleted(task)">
<label :for="'detailsToggleCompleted_' + task.uid" />
<label :class="[checkboxColor]" :for="'detailsToggleCompleted_' + task.uid" />
</span>
<div v-click-outside="() => finishEditing('summary')" class="title-wrapper">
<div v-linkify="task.summary"
Expand Down Expand Up @@ -618,6 +618,10 @@ export default {
}
return ''
},
checkboxColor() {
const priority = this.priorityClass
return priority ? `priority-${priority}` : ''
},
completeString() {
return this.$t('tasks', '{percent} % completed', { percent: this.task.complete })
},
Expand Down