Merge branch 'release' into develop

website/client/components/shops/quests/questInfo.vue

@@ -1,57 +1,41 @@
 <template lang="pug">
 .row(:class="{'small-version': smallVersion}")
   dl
-  .table-row(v-if="quest.collect")
-    dt {{ $t('collect') + ':' }}
-    dd
+  template(v-if="quest.collect")
+    dt(:class="smallVersion ? 'col-3' : 'col-4'") {{ $t('collect') + ':' }}
+    dd.col-8
       div(v-for="(collect, key) of quest.collect")
         span {{ collect.count }} {{ getCollectText(collect) }}
 
-  .table-row(v-if="quest.boss")
-    dt {{ $t('bossHP') + ':' }}
-    dd {{ quest.boss.hp }}
+  template(v-if="quest.boss")
+    dt(:class="smallVersion ? 'col-3' : 'col-4'") {{ $t('bossHP') + ':' }}
+    dd.col-8 {{ quest.boss.hp }}
 
-  .table-row
-    dt {{ $t('difficulty') + ':' }}
-    dd
-      .svg-icon.inline(
-        v-for="star of stars()", v-html="icons[star]",
-        :class="smallVersion ? 'icon-12' : 'icon-16'",
-      )
+  dt(:class="smallVersion ? 'col-3' : 'col-4'") {{ $t('difficulty') + ':' }}
+  dd.col-8
+    .svg-icon.inline(
+      v-for="star of stars()", v-html="icons[star]",
+      :class="smallVersion ? 'icon-12' : 'icon-16'",
+    )
 </template>
 
 <style lang="scss" scoped>
 @import '~client/assets/scss/colors.scss';
 
-.row {
-  display: table;
-  color: #E1E0E3;
-}
-
-.table-row {
-  display: table-row;
-  margin-bottom: 4px;
-}
-
-dd {
-  padding-left: 1em;
-  padding-bottom: 4px;
-}
-
-dt, dd {
-  display: table-cell;
-}
-
-dt, dd, dd > * {
-  text-align: left;
-}
-
 dt {
   font-size: 1.3em;
   line-height: 1.2;
   color: $gray-50;
 }
 
+.col-8 {
+  text-align: left;
+}
+
+.col-8:not(:last-child) {
+  margin-bottom: 4px;
+}
+
 .svg-icon {
   margin-right: 4px;
 }

website/client/components/tasks/column.vue

@@ -37,9 +37,8 @@
     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",
@@ -50,11 +49,12 @@
         :group='group',
       )
     template(v-if="hasRewardsList")
-      draggable.reward-items(
+      draggable(
         ref="rewardsList",
         @update="rewardSorted",
         @start="rewardDragStart",
         @end="rewardDragEnd",
+        class="reward-items",
       )
         shopItem(
           v-for="reward in inAppRewards",
@@ -76,9 +76,6 @@
 <style lang="scss" scoped>
   @import '~client/assets/scss/colors.scss';
 
-  /deep/ .draggable-cursor {
-    cursor: grabbing;
-  }
 
   .tasks-column {
     min-height: 556px;
@@ -92,6 +89,7 @@
     margin-top: 16px;
   }
 
+
   .reward-items {
     @supports (display: grid) {
       display: grid;
@@ -337,7 +335,6 @@ export default {
       showPopovers: true,
 
       selectedItemToBuy: {},
-      dragging: false,
     };
   },
   created () {
@@ -524,11 +521,9 @@ 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
@@ -683,14 +678,6 @@ 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>

website/client/components/tasks/task.vue

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

website/client/components/tasks/user.vue

@@ -12,7 +12,7 @@
       .col-12.col-md-4.offset-md-4
         .d-flex
           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.search-button(
+          button.btn.btn-secondary.dropdown-toggle.ml-2.d-flex.align-items-center(
             type="button",
             @click="toggleFilterPanel()",
             :class="{active: selectedTags.length > 0}",
@@ -110,10 +110,6 @@
     padding-top: 16px;
   }
 
-  .input-search, .search-button {
-    height: 40px;
-  }
-
   .tasks-navigation {
     margin-bottom: 20px;
   }