Revert drag handle changes.

6 files changed, 6 insertions, 96 deletions

diff --git a/client/components/cards/checklists.jade b/client/components/cards/checklists.jade
index 635b4092..279d3671 100644
--- a/client/components/cards/checklists.jade
+++ b/client/components/cards/checklists.jade
@@ -31,20 +31,10 @@ template(name="checklistDetail")
           h2.title.js-open-inlined-form.is-editable
             +viewer
               = checklist.title
-          if isMiniScreen
-            a.checklist-handle.handle.fa.fa-arrows.js-checklist-handle
-          unless isMiniScreen
-            if showDesktopDragHandles
-              a.checklist-handle.handle.fa.fa-arrows.js-checklist-handle
         else
           h2.title
             +viewer
                 = checklist.title
-            if isMiniScreen
-              a.checklist-handle.handle.fa.fa-arrows.js-checklist-handle
-            unless isMiniScreen
-              if showDesktopDragHandles
-                a.checklist-handle.handle.fa.fa-arrows.js-checklist-handle
     +checklistItems(checklist = checklist)
 
 template(name="checklistDeleteDialog")
@@ -85,11 +75,6 @@ template(name="checklistItems")
         +editChecklistItemForm(type = 'item' item = item checklist = checklist)
       else
         +checklistItemDetail(item = item checklist = checklist)
-        if isMiniScreen
-          a.checklist-item-handle.handle.fa.fa-arrows.js-checklist-item-handle
-        unless isMiniScreen
-          if showDesktopDragHandles
-            a.checklist-item-handle.handle.fa.fa-arrows.js-checklist-item-handle
     if canModifyCard
       +inlinedForm(autoclose=false classNames="js-add-checklist-item" checklist = checklist)
         +addChecklistItemForm
diff --git a/client/components/cards/checklists.js b/client/components/cards/checklists.js
index 2128b67d..57939eb8 100644
--- a/client/components/cards/checklists.js
+++ b/client/components/cards/checklists.js
@@ -39,7 +39,6 @@ function initSorting(items) {
 
   // ugly touch event hotfix
   enableClickOnTouch('.js-checklist-item:not(.placeholder)');
-
 }
 
 BlazeComponent.extendComponent({
@@ -61,30 +60,6 @@ BlazeComponent.extendComponent({
       if ($itemsDom.data('sortable')) {
         $(self.itemsDom).sortable('option', 'disabled', !userIsMember());
       }
-      if(Utils.isMiniScreen()) {
-        this.$('.js-checklists').sortable({
-          handle: '.checklist-handle',
-        });
-        this.$('.js-checklist-item').sortable({
-          handle: '.checklist-item-handle',
-        });
-      } else {
-        if (Meteor.user().hasShowDesktopDragHandles()) {
-          this.$('.js-checklists').sortable({
-            handle: '.checklist-handle',
-          });
-          this.$('.js-checklist-item').sortable({
-            handle: '.checklist-item-handle',
-          });
-        } else {
-          this.$('.js-checklists').sortable({
-            handle: '.checklist-title',
-          });
-          this.$('.js-checklist-item').sortable({
-            handle: '.checklist-item',
-          });
-        }
-      }
     });
   },
 
@@ -97,12 +72,6 @@ BlazeComponent.extendComponent({
   },
 }).register('checklistDetail');
 
-Template.checklistDetail.helpers({
-  showDesktopDragHandles() {
-    return Meteor.user().hasShowDesktopDragHandles();
-  },
-});
-
 BlazeComponent.extendComponent({
   addChecklist(event) {
     event.preventDefault();
@@ -228,12 +197,6 @@ BlazeComponent.extendComponent({
   },
 }).register('checklists');
 
-Template.checklists.helpers({
-  showDesktopDragHandles() {
-    return Meteor.user().hasShowDesktopDragHandles();
-  },
-});
-
 Template.checklistDeleteDialog.onCreated(() => {
   const $cardDetails = this.$('.card-details');
   this.scrollState = {
@@ -268,9 +231,6 @@ Template.checklistItemDetail.helpers({
       !Meteor.user().isCommentOnly()
     );
   },
-  showDesktopDragHandles() {
-    return Meteor.user().hasShowDesktopDragHandles();
-  },
 });
 
 BlazeComponent.extendComponent({
diff --git a/client/components/cards/checklists.styl b/client/components/cards/checklists.styl
index dd3afe04..8ac37a15 100644
--- a/client/components/cards/checklists.styl
+++ b/client/components/cards/checklists.styl
@@ -35,14 +35,6 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item
     &.is-finished
       color: #3cb500
 
-  .checklist-handle
-    position: absolute
-    float: right
-    padding-bottom: 30px
-    transform: translateY(-50%)
-    left: 400px
-    font-size: 18px
-
   .js-delete-checklist
     @extends .delete-text
 
@@ -78,7 +70,7 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item
       margin-left: 12%
       float: left
     .toggle-delete-checklist-dialog
-      margin-right: 20%
+      margin-right: 12%
       float: right
 
 #card-details-overlay
@@ -133,19 +125,12 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item
     &.is-checked
       color: #8c8c8c
       font-style: italic
-    &.viewer
+    & .viewer
       p
         margin-bottom: 2px
         display: block
         word-wrap: break-word
         max-width: 420px
-    .checklist-item-handle
-      position: absolute
-      float: right
-      padding-bottom: 30px
-      transform: translateY(-50%)
-      left: 400px
-      font-size: 18px
 
 .js-delete-checklist-item
   margin: 0 0 0.5em 1.33em
diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade
index 2bc20622..3806ce41 100644
--- a/client/components/cards/minicard.jade
+++ b/client/components/cards/minicard.jade
@@ -3,13 +3,6 @@ template(name="minicard")
     class="{{#if isLinkedCard}}linked-card{{/if}}"
     class="{{#if isLinkedBoard}}linked-board{{/if}}"
     class="minicard-{{colorClass}}")
-    unless isMiniScreen
-      if showDesktopDragHandles
-        .handle
-          .fa.fa-arrows
-    if isMiniScreen
-      .handle
-        .fa.fa-arrows
     if cover
       .minicard-cover(style="background-image: url('{{cover.url}}');")
     if labels
@@ -22,6 +15,8 @@ template(name="minicard")
           if hiddenMinicardLabelText
             .minicard-label(class="card-label-{{color}}" title="{{name}}")
     .minicard-title
+      .handle
+        .fa.fa-arrows
       if $eq 'prefix-with-full-path' currentBoard.presentParentTask
         .parent-prefix
           | {{ parentString ' > ' }}
diff --git a/client/components/cards/minicard.js b/client/components/cards/minicard.js
index 4c76db46..4c25c11d 100644
--- a/client/components/cards/minicard.js
+++ b/client/components/cards/minicard.js
@@ -26,9 +26,6 @@ BlazeComponent.extendComponent({
 }).register('minicard');
 
 Template.minicard.helpers({
-  showDesktopDragHandles() {
-    return Meteor.user().hasShowDesktopDragHandles();
-  },
   hiddenMinicardLabelText() {
     return Meteor.user().hasHiddenMinicardLabelText();
   },
diff --git a/client/components/cards/minicard.styl b/client/components/cards/minicard.styl
index 428a7abe..30228063 100644
--- a/client/components/cards/minicard.styl
+++ b/client/components/cards/minicard.styl
@@ -105,25 +105,13 @@
     right: 5px;
     top: 5px;
     display:none;
-    @media only screen and (min-width: 1200px) {
+    // @media only screen and (max-width: 1199px) {
+    @media only screen and (max-width: 800px) {
       display:block;
     }
     .fa-arrows
       font-size:20px;
       color: #ccc;
-  //.handle-minicard-desktop
-  //  width: 20px;
-  //  height: 20px;
-  //  position: absolute;
-  //  right: 5px;
-  //  top: 5px;
-  //  display:none;
-  //  @media only screen and (min-width: 1200px) {
-  //    display:block;
-  //  }
-  //  .fa-arrows
-  //    font-size:20px;
-  //    color: #ccc;
   .minicard-title
     p:last-child
       margin-bottom: 0