krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 23:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tasks Redesign: Colors, Title, Notes, Habit Controls, Button Style (#12274)

Browse Source 
* extract color changes + habit-controls out of #12142

* extract title / notes changes from #12142

* extracted delete btn + style fixes of #12142

* fix taskModal footer + advancedSettings

* extracted the button style changes from #12142

* remove un-used method
This commit is contained in:
negue
2020-06-11 21:14:33 +02:00
committed by GitHub
parent 5957930709
commit f3ea5f0b62
6 changed files with 593 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
website/client/src/components/tasks/task.vue
View File

@@ -25,13 +25,16 @@
>
<div
class="task-control habit-control"
:class="controlClass.up.inner"
:class="[{
'habit-control-positive-enabled': task.up && isUser,
'habit-control-positive-disabled': !task.up && isUser,
}, controlClass.up.inner]"
@click="(isUser && task.up) ? score('up') : null"
>
<div
v-if="task.group.id && !isUser"
v-if="!isUser"
class="svg-icon lock"
:class="controlClass.up.icon"
:class="task.up ? controlClass.up.icon : 'positive'"
v-html="icons.lock"
></div>
<div
@@ -55,7 +58,7 @@
@click="isUser ? score(task.completed ? 'down' : 'up') : null"
>
<div
v-if="task.group.id && !isUser && !task.completed"
v-if="!isUser"
class="svg-icon lock"
:class="controlClass.icon"
v-html="icons.lock"
@@ -186,7 +189,7 @@
v-if="!task.collapseChecklist"
:key="item.id"
class="custom-control custom-checkbox checklist-item"
:class="{'checklist-item-done': item.completed}"
:class="{'checklist-item-done': item.completed, 'cursor-auto': !isUser}"
>
<!-- eslint-enable vue/no-use-v-if-with-v-for -->
<input
@@ -307,13 +310,16 @@
>
<div
class="task-control habit-control"
:class="controlClass.down.inner"
:class="[{
'habit-control-negative-enabled': task.down && isUser,
'habit-control-negative-disabled': !task.down && isUser,
}, controlClass.down.inner]"
@click="(isUser && task.down) ? score('down') : null"
>
<div
v-if="task.group.id && !isUser"
class="svg-icon lock"
:class="controlClass.down.icon"
:class="task.down ? controlClass.down.icon : 'negative'"
v-html="icons.lock"
></div>
<div
@@ -353,15 +359,18 @@
@import '~@/assets/scss/colors.scss';
.control-bottom-box {
border-bottom-left-radius: 0px !important;
border-bottom-right-radius: 0px !important;
border-bottom-left-radius: 0 !important;
border-bottom-right-radius: 0 !important;
}
.control-top-box {
border-top-left-radius: 0px !important;
border-top-right-radius: 0px !important;
border-top-left-radius: 0 !important;
border-top-right-radius: 0 !important;
}
.cursor-auto {
cursor: auto;
}
.task {
margin-bottom: 2px;