From c3ba70f5d6a5b4419620cf4ef1448e447f364710 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Fri, 4 Aug 2017 23:27:11 +0200 Subject: [PATCH] Tasks scoring and misc fixes (#8925) * wip: add task scoring and persist checklist items * remove unused files, fix checklist scoring and start adding support for groups tasks * amke group and challenge tasks not scoreable --- website/client/assets/scss/task.scss | 30 ++++- website/client/components/tasks/column.vue | 2 +- website/client/components/tasks/task.vue | 123 ++++++++++++++++-- website/client/merch/stickermule-logo.png | Bin 4672 -> 0 bytes website/client/merch/stickermule-logo.svg | 1 - website/client/merch/stickermule.png | Bin 10586 -> 0 bytes website/client/merch/teespring-eu-logo.png | Bin 7630 -> 0 bytes website/client/merch/teespring-eu.png | Bin 313049 -> 0 bytes website/client/merch/teespring-logo.png | Bin 7630 -> 0 bytes website/client/merch/teespring-logo.svg | 63 --------- .../client/merch/teespring-mug-eu-logo.png | Bin 7630 -> 0 bytes website/client/merch/teespring-mug-eu.png | Bin 101280 -> 0 bytes website/client/merch/teespring-mug-logo.png | Bin 7630 -> 0 bytes website/client/merch/teespring-mug.png | Bin 108235 -> 0 bytes website/client/merch/teespring.png | Bin 403704 -> 0 bytes website/client/store/actions/tasks.js | 6 +- .../common/script/content/loginIncentives.js | 2 +- website/common/script/content/spells.js | 34 ++--- website/common/script/fns/crit.js | 3 +- website/common/script/fns/randomDrop.js | 7 +- website/common/script/fns/ultimateGear.js | 2 +- website/common/script/fns/updateStats.js | 6 +- website/common/script/ops/blockUser.js | 2 +- website/common/script/ops/clearPMs.js | 2 +- website/common/script/ops/deletePM.js | 2 +- website/common/script/ops/deleteTag.js | 2 +- website/common/script/ops/openMysteryItem.js | 2 +- website/common/script/ops/rebirth.js | 2 +- website/common/script/ops/scoreTask.js | 21 +-- website/common/script/ops/unlock.js | 2 +- 30 files changed, 194 insertions(+), 120 deletions(-) delete mode 100644 website/client/merch/stickermule-logo.png delete mode 100644 website/client/merch/stickermule-logo.svg delete mode 100644 website/client/merch/stickermule.png delete mode 100644 website/client/merch/teespring-eu-logo.png delete mode 100644 website/client/merch/teespring-eu.png delete mode 100644 website/client/merch/teespring-logo.png delete mode 100644 website/client/merch/teespring-logo.svg delete mode 100644 website/client/merch/teespring-mug-eu-logo.png delete mode 100644 website/client/merch/teespring-mug-eu.png delete mode 100644 website/client/merch/teespring-mug-logo.png delete mode 100644 website/client/merch/teespring-mug.png delete mode 100644 website/client/merch/teespring.png diff --git a/website/client/assets/scss/task.scss b/website/client/assets/scss/task.scss index 30387aa58a..5adb1421a9 100644 --- a/website/client/assets/scss/task.scss +++ b/website/client/assets/scss/task.scss @@ -1,4 +1,21 @@ - .task { +.daily-todo-control { + + &:hover { + .svg-icon.check { + display: block; + } + } + + .svg-icon.check { + display: none; + + &.display-check-icon { + display: block; + } + } +} + +.task { // for editing rewards or when a task is created &-purple { background: $purple-300; @@ -20,6 +37,7 @@ &-control-daily-todo { background: $maroon-500; + background: $maroon-100; } &-modal-input { @@ -35,6 +53,7 @@ &-control-daily-todo { background: $red-500; + color: $red-100; } &-modal-input { @@ -50,6 +69,7 @@ &-control-daily-todo { background: $orange-500; + color: $orange-100; } &-modal-input { @@ -58,13 +78,14 @@ } &-neutral { - background: $yellow-50; + background: $yellow-100; &-control-habit { - background: darken($yellow-50, 12%); + background: darken($yellow-100, 12%); } &-control-daily-todo { background: $yellow-500; + color: $yellow-100; } &-modal-input { @@ -80,6 +101,7 @@ &-control-daily-todo { background: $green-500; + color: $green-10; } &-modal-input { @@ -95,6 +117,7 @@ &-control-daily-todo { background: $blue-500; + color: $blue-50; } &-modal-input { @@ -110,6 +133,7 @@ &-control-daily-todo { background: $teal-500; + color: $teal-50; } &-modal-input { diff --git a/website/client/components/tasks/column.vue b/website/client/components/tasks/column.vue index 466c858776..807aa5e42b 100644 --- a/website/client/components/tasks/column.vue +++ b/website/client/components/tasks/column.vue @@ -1,7 +1,6 @@