Skip to content

Fix dragging to tasks without (visible) subtasks #1150

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 2 commits into from
Jul 29, 2020
Merged

Fix dragging to tasks without (visible) subtasks #1150

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
939cf7d
Always show subtasks container
raimund-schluessler Jul 29, 2020
f96cda9
Correctly show round corners on add task input
raimund-schluessler Jul 29, 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
Prev Previous commit
Correctly show round corners on add task input 
Signed-off-by: Raimund Schlüßler <[email protected]>
  • Loading branch information
@raimund-schluessler
raimund-schluessler committed Jul 29, 2020
commit f96cda9a96ad48707b824dcbfd655f319ed2bd40
9 changes: 6 additions & 3 deletions css/src/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,8 +480,7 @@ $blue_due: #4271a6; // due dates and low importance
border-top: 1px solid var(--color-border);

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

Expand All @@ -491,9 +490,13 @@ $blue_due: #4271a6; // due dates and low importance
border-bottom-right-radius: var(--border-radius);
}

&:not(.subtasks-visible) .add-task input {
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;
Expand Down
3 changes: 2 additions & 1 deletion src/components/TaskBody.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
readOnly: readOnly,
deleted: !!deleteTimeout,
subtasksHidden: !showSubtasks,
'container-visible': ((showSubtasks && filteredSubtasks.length) || showSubtaskInput)
'container-visible': (filteredSubtasksShown.length || showSubtaskInput),
'subtasks-visible': filteredSubtasksShown.length
}"
:data-priority="[task.priority]"
class="task-item"
Expand Down