fixes Tasks UI (#11036)

* show grabbing cursor while dragging

* 40px height search + tags button

* remove margin of task-title markdown-p-tag

* remove pointer on disabled task-controls

* show `Options` instead of  `Show More`

* remove margin of checklist items

* remove space between notes and checklist
This commit is contained in:
negue
2019-03-03 17:28:58 +01:00
committed by Matteo Pagliazzi
parent 2595ccb2b4
commit f548103f4c
4 changed files with 32 additions and 9 deletions

View File

@@ -37,8 +37,9 @@
draggable.sortable-tasks( draggable.sortable-tasks(
ref="tasksList", ref="tasksList",
@update='taskSorted', @update='taskSorted',
@start="isDragging(true)",
@end="isDragging(false)",
:options='{disabled: activeFilter.label === "scheduled", scrollSensitivity: 64}', :options='{disabled: activeFilter.label === "scheduled", scrollSensitivity: 64}',
class="sortable-tasks"
) )
task( task(
v-for="task in taskList", v-for="task in taskList",
@@ -49,12 +50,11 @@
:group='group', :group='group',
) )
template(v-if="hasRewardsList") template(v-if="hasRewardsList")
draggable( draggable.reward-items(
ref="rewardsList", ref="rewardsList",
@update="rewardSorted", @update="rewardSorted",
@start="rewardDragStart", @start="rewardDragStart",
@end="rewardDragEnd", @end="rewardDragEnd",
class="reward-items",
) )
shopItem( shopItem(
v-for="reward in inAppRewards", v-for="reward in inAppRewards",
@@ -76,6 +76,9 @@
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~client/assets/scss/colors.scss'; @import '~client/assets/scss/colors.scss';
/deep/ .draggable-cursor {
cursor: grabbing;
}
.tasks-column { .tasks-column {
min-height: 556px; min-height: 556px;
@@ -89,7 +92,6 @@
margin-top: 16px; margin-top: 16px;
} }
.reward-items { .reward-items {
@supports (display: grid) { @supports (display: grid) {
display: grid; display: grid;
@@ -335,6 +337,7 @@ export default {
showPopovers: true, showPopovers: true,
selectedItemToBuy: {}, selectedItemToBuy: {},
dragging: false,
}; };
}, },
created () { created () {
@@ -521,9 +524,11 @@ export default {
rewardDragStart () { rewardDragStart () {
// We need to stop popovers from interfering with our dragging // We need to stop popovers from interfering with our dragging
this.showPopovers = false; this.showPopovers = false;
this.isDragging(true);
}, },
rewardDragEnd () { rewardDragEnd () {
this.showPopovers = true; this.showPopovers = true;
this.isDragging(false);
}, },
quickAdd (ev) { quickAdd (ev) {
// Add a new line if Shift+Enter Pressed // Add a new line if Shift+Enter Pressed
@@ -678,6 +683,14 @@ export default {
this.error(e.message); 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> </script>

View File

@@ -20,7 +20,7 @@
v-if="isUser && !isRunningYesterdailies", v-if="isUser && !isRunningYesterdailies",
:right="task.type === 'reward'", :right="task.type === 'reward'",
ref="taskDropdown", ref="taskDropdown",
v-b-tooltip.hover.top="$t('showMore')" v-b-tooltip.hover.top="$t('options')"
) )
div(slot="dropdown-toggle", draggable=false) div(slot="dropdown-toggle", draggable=false)
.svg-icon.dropdown-icon(v-html="icons.menu") .svg-icon.dropdown-icon(v-html="icons.menu")
@@ -141,6 +141,11 @@
min-width: 0px; min-width: 0px;
overflow-wrap: break-word; overflow-wrap: break-word;
// markdown p-tag, can't find without /deep/
/deep/ p {
margin-bottom: 0;
}
&.has-notes { &.has-notes {
padding-bottom: 4px; padding-bottom: 4px;
} }
@@ -229,7 +234,7 @@
overflow-wrap: break-word; overflow-wrap: break-word;
&.has-checklist { &.has-checklist {
padding-bottom: 8px; padding-bottom: 2px;
} }
} }
@@ -285,7 +290,7 @@
margin-bottom: -3px; margin-bottom: -3px;
min-height: 0px; min-height: 0px;
width: 100%; width: 100%;
margin-left: 8px; margin-left: 0;
padding-right: 20px; padding-right: 20px;
overflow-wrap: break-word; overflow-wrap: break-word;
@@ -427,7 +432,7 @@
border-left: none; border-left: none;
} }
.task-control, .reward-control { .task-control:not(.task-disabled-habit-control-inner), .reward-control {
cursor: pointer; cursor: pointer;
} }

View File

@@ -12,7 +12,7 @@
.col-12.col-md-4.offset-md-4 .col-12.col-md-4.offset-md-4
.d-flex .d-flex
input.form-control.input-search(type="text", :placeholder="$t('search')", v-model="searchText") input.form-control.input-search(type="text", :placeholder="$t('search')", v-model="searchText")
button.btn.btn-secondary.dropdown-toggle.ml-2.d-flex.align-items-center( button.btn.btn-secondary.dropdown-toggle.ml-2.d-flex.align-items-center.search-button(
type="button", type="button",
@click="toggleFilterPanel()", @click="toggleFilterPanel()",
:class="{active: selectedTags.length > 0}", :class="{active: selectedTags.length > 0}",
@@ -110,6 +110,10 @@
padding-top: 16px; padding-top: 16px;
} }
.input-search, .search-button {
height: 40px;
}
.tasks-navigation { .tasks-navigation {
margin-bottom: 20px; margin-bottom: 20px;
} }

View File

@@ -34,6 +34,7 @@
"saveEdits": "Save Edits", "saveEdits": "Save Edits",
"showMore": "Show More", "showMore": "Show More",
"showLess": "Show Less", "showLess": "Show Less",
"options": "Options",
"expandToolbar": "Expand Toolbar", "expandToolbar": "Expand Toolbar",
"collapseToolbar": "Collapse Toolbar", "collapseToolbar": "Collapse Toolbar",