mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-17 22:57:21 +01:00
merge negue-ui-fixes into develop
Squashed commit of the following: commit d0628da7557e718b4d144283949f6572718d9b45 Author: negue <eugen.bolz@gmail.com> Date: Fri Mar 15 19:34:39 2019 +0100 fix quest-tooltip padding/sizes commit c16bc0fe4521e01520628ddc84af54930b15e066 Merge: 24e3fe2a6163f31688Author: negue <eugen.bolz@gmail.com> Date: Fri Mar 15 18:58:51 2019 +0100 Merge branch 'fix/quest-tooltip-cells' into negue-ui-fixes commit 24e3fe2a6c8e384722d95f7edd9ce9e4ce16960c Author: negue <eugen.bolz@gmail.com> Date: Fri Mar 15 18:49:47 2019 +0100 use item margin instead of container padding commit 03ab975193b2007e24fcbb971fc7d4169bfb3ac7 Author: negue <eugen.bolz@gmail.com> Date: Thu Mar 14 21:41:43 2019 +0100 fix input heights commit 3aa18f1105a02655066e10a82cf53be9340a6bf1 Author: negue <eugen.bolz@gmail.com> Date: Thu Mar 14 20:58:22 2019 +0100 revert margin-bottom on checklist commit d8f533fda1d3833ab2f4aeb3bd8001d4a7881e8b Merge: fbd01ab797d45dcfeeAuthor: Sabe Jones <sabrecat@gmail.com> Date: Thu Mar 14 11:10:34 2019 -0500 Merge branch 'fix/shops-ui' into negue-ui-fixes commit fbd01ab79d5ea8144c191cd51a9c11216418493a Merge: 65517d259546e260e3Author: Sabe Jones <sabrecat@gmail.com> Date: Thu Mar 14 11:09:03 2019 -0500 Merge branch 'fix/more-ui' into negue-ui-fixes commit 65517d25947144f57b84fad84ce709ac7d008119 Merge:5e935230a2dcec78a4Author: Sabe Jones <sabrecat@gmail.com> Date: Thu Mar 14 11:08:20 2019 -0500 Merge branch 'fix/tasks-ui' into negue-ui-fixes commit546e260e36Author: negue <eugen.bolz@gmail.com> Date: Sat Mar 9 23:13:54 2019 +0100 fix checkbox check mark commit46ea2010f8Author: negue <eugen.bolz@gmail.com> Date: Sat Mar 9 22:48:20 2019 +0100 remove bottom margin on a collapsed checklist commit7d45dcfee5Author: negue <eugen.bolz@gmail.com> Date: Wed Mar 6 22:45:09 2019 +0100 fix star/empty colors - fix quest layout - countBadge z-index commitf9b9e75c18Author: negue <eugen.bolz@gmail.com> Date: Mon Mar 4 20:14:49 2019 +0100 shops - timeTravelers: refactor filter logic commit6d3e9e0de0Author: negue <eugen.bolz@gmail.com> Date: Mon Mar 4 20:06:02 2019 +0100 shops-seasonal: refactor filter logic commitaa2949e9d1Author: negue <eugen.bolz@gmail.com> Date: Mon Mar 4 19:54:23 2019 +0100 shops - quest: refactor filter logic + quest items margins commitad62b7a358Author: negue <eugen.bolz@gmail.com> Date: Mon Mar 4 19:50:51 2019 +0100 shop: equipment-cards background + market filter logic (as other pages) commit2dcec78a4aAuthor: negue <eugen.bolz@gmail.com> Date: Wed Feb 27 21:02:10 2019 +0100 remove space between notes and checklist commit31fab9b66dAuthor: negue <eugen.bolz@gmail.com> Date: Wed Feb 27 20:45:59 2019 +0100 remove margin of checklist items commit28b134a19bAuthor: negue <eugen.bolz@gmail.com> Date: Wed Feb 27 20:33:43 2019 +0100 show `Options` instead of `Show More` commitcafcfb6112Author: negue <eugen.bolz@gmail.com> Date: Wed Feb 27 20:30:22 2019 +0100 remove pointer on disabled task-controls commit7acbcc424bAuthor: negue <eugen.bolz@gmail.com> Date: Wed Feb 27 20:25:36 2019 +0100 remove margin of task-title markdown-p-tag commitf667ab957bAuthor: negue <eugen.bolz@gmail.com> Date: Wed Feb 27 20:25:16 2019 +0100 40px height search + tags button commit2080ecb7e8Author: negue <eugen.bolz@gmail.com> Date: Wed Feb 27 20:24:35 2019 +0100 show grabbing cursor while dragging commit163f316889Author: negue <eugen.bolz@gmail.com> Date: Fri Feb 15 23:26:40 2019 +0100 replace the questInfo to use table-like behavior, expands to the content
This commit is contained in:
@@ -37,8 +37,9 @@
|
||||
draggable.sortable-tasks(
|
||||
ref="tasksList",
|
||||
@update='taskSorted',
|
||||
@start="isDragging(true)",
|
||||
@end="isDragging(false)",
|
||||
:options='{disabled: activeFilter.label === "scheduled", scrollSensitivity: 64}',
|
||||
class="sortable-tasks"
|
||||
)
|
||||
task(
|
||||
v-for="task in taskList",
|
||||
@@ -49,12 +50,11 @@
|
||||
:group='group',
|
||||
)
|
||||
template(v-if="hasRewardsList")
|
||||
draggable(
|
||||
draggable.reward-items(
|
||||
ref="rewardsList",
|
||||
@update="rewardSorted",
|
||||
@start="rewardDragStart",
|
||||
@end="rewardDragEnd",
|
||||
class="reward-items",
|
||||
)
|
||||
shopItem(
|
||||
v-for="reward in inAppRewards",
|
||||
@@ -76,6 +76,9 @@
|
||||
<style lang="scss" scoped>
|
||||
@import '~client/assets/scss/colors.scss';
|
||||
|
||||
/deep/ .draggable-cursor {
|
||||
cursor: grabbing;
|
||||
}
|
||||
|
||||
.tasks-column {
|
||||
min-height: 556px;
|
||||
@@ -89,7 +92,6 @@
|
||||
margin-top: 16px;
|
||||
}
|
||||
|
||||
|
||||
.reward-items {
|
||||
@supports (display: grid) {
|
||||
display: grid;
|
||||
@@ -335,6 +337,7 @@ export default {
|
||||
showPopovers: true,
|
||||
|
||||
selectedItemToBuy: {},
|
||||
dragging: false,
|
||||
};
|
||||
},
|
||||
created () {
|
||||
@@ -521,9 +524,11 @@ export default {
|
||||
rewardDragStart () {
|
||||
// We need to stop popovers from interfering with our dragging
|
||||
this.showPopovers = false;
|
||||
this.isDragging(true);
|
||||
},
|
||||
rewardDragEnd () {
|
||||
this.showPopovers = true;
|
||||
this.isDragging(false);
|
||||
},
|
||||
quickAdd (ev) {
|
||||
// Add a new line if Shift+Enter Pressed
|
||||
@@ -678,6 +683,14 @@ export default {
|
||||
this.error(e.message);
|
||||
}
|
||||
},
|
||||
isDragging (dragging) {
|
||||
this.dragging = dragging;
|
||||
if (dragging) {
|
||||
document.documentElement.classList.add('draggable-cursor');
|
||||
} else {
|
||||
document.documentElement.classList.remove('draggable-cursor');
|
||||
}
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user