Skip to content

Update to the design of the task list #1135

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

Closed
timkrief wants to merge 6 commits into from
Closed

Update to the design of the task list #1135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0c46807
Update the design as discussed in issue #664
timkrief Jul 21, 2020
612354f
Made lines straight between two rows on the same level
timkrief Jul 21, 2020
8c54b2a
Fixed tasks with hidden subtasks styling
timkrief Jul 21, 2020
94d4967
Removed a CSS property that wasn't useful anymore.
timkrief Jul 21, 2020
6bfa4d4
Fixed an edge case for the style of the last element
timkrief Jul 21, 2020
e39cf9d
Fixed tasklist overlapping menu.
timkrief Jul 21, 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
161 changes: 122 additions & 39 deletions css/src/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ $red_overdue: #b3312d; // overdue dates and high importance
$yellow: #fd0; // medium importance
$blue_due: #4271a6; // due dates and low importance

// Specify colors for each non-zero priority level
$priority_colors: ($red_overdue, $red_overdue, $red_overdue, $red_overdue, $yellow, $blue_due, $blue_due, $blue_due, $blue_due);

/**
* rules for app-navigation
*/
Expand Down Expand Up @@ -248,11 +251,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 +268,10 @@ $blue_due: #4271a6; // due dates and low importance
.add-task {
position: relative;
width: calc(100% - 44px);

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

.sortorder {
Expand Down Expand Up @@ -372,26 +381,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 +418,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 @@ -425,17 +429,59 @@ $blue_due: #4271a6; // due dates and low importance
}
}


/*
This mixin is a way to remove the squared corners from the last task of a tree.
CSS has no selector for this, this is done using a recursive mixin for up to 8 sublevels of tasks (arbitrary chosen).
After this point, the last task of the tree will have squared corners, but nothing will technically break.
*/

@mixin remove-last-squared-corners($sublevels-left: 8) {
&>.add-task{
&::before{
display: block;
}
&::after{
display: none;
}
}
&::before,
&>ol:empty::before {
display: none !important;
}
@if $sublevels-left > 0 {
&>ol>.task-item:last-child>.subtasks-container{
@include remove-last-squared-corners($sublevels-left - 1);
}
}
}

.grouped-tasks,
.sortable-ghost>.subtasks-container {
@include remove-last-squared-corners;
}

.grouped-tasks {
position: relative;
padding-top: 2px;


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

&:hover {
z-index: 10;
}
}

.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,14 +492,47 @@ $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;
}

.subtasks-container {
&.subtasksHidden>.subtasks-container {
margin-left: 44px;
}
&:not(.subtasksHidden)>.subtasks-container{
&>ol:not(:empty),
&>.add-task + ol,
&>.add-task {
margin-left: 44px;
}
}

&.subtasksHidden>.subtasks-container::before,
&.subtasksHidden>.subtasks-container>.add-task::before,
&.subtasksHidden>.subtasks-container>.add-task::after,
&:not(.subtasksHidden)>.subtasks-container>.add-task::before,
&>.subtasks-container>ol::before {
content: '';
display: block;
height: 1px;
border: 0 solid var(--color-main-background);
border-width: var(--border-radius) 0;
margin: calc(-1 * var(--border-radius)) 0;
background-color: var(--color-background-darker);
position: relative;
z-index: -1;
}
&.subtasksHidden>.subtasks-container>.add-task::before{
display: none;
}

// Apply colors to checkboxes for each non-zero priority level
@for $i from 1 through 9 {
&[data-priority="#{$i}"]>.task-body>.task-checkbox>input[type='checkbox'].checkbox + label::before {
border-color: nth($priority_colors, $i);
}
}

.task-body {
display: flex;
Expand All @@ -462,21 +541,25 @@ $blue_due: #4271a6; // due dates and low importance
align-items: center;
height: 44px;
position: relative;
border: 1px solid var(--color-border-dark);

&:hover {
background-color: var(--color-background-hover);
}
background-color: var(--color-main-background);
border-radius: var(--border-radius);

&.active {
background-color: var(--color-primary-light) !important;
.task-info .title {
font-weight: bold;
}
}

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

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

.task-info {
Expand Down
2 changes: 1 addition & 1 deletion src/components/TaskBody.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ 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}"
:data-priority="[task.priority]"
class="task-item"
@dragstart="dragStart($event)">
Expand Down