Bladeren bron

Merge branch 'ui-feature-drag-handler' of https://github.com/hupptechnologies/wekan into hupptechnologies-ui-feature-drag-handler

Lauri Ojansivu 6 jaren geleden
bovenliggende
commit
32d5a1d3f7

+ 0 - 4
.meteor/versions

@@ -179,8 +179,4 @@ useraccounts:unstyled@1.14.2
 verron:autosize@3.0.8
 webapp@1.4.0
 webapp-hashing@1.0.9
-wekan-scrollbar@3.1.3
-wekan:accounts-cas@0.1.0
-wekan:wekan-ldap@0.0.2
-yasaricli:slugify@0.0.7
 zimme:active-route@2.3.2

+ 2 - 0
client/components/cards/minicard.jade

@@ -9,6 +9,8 @@ template(name="minicard")
         each labels
           .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 ' > ' }}

+ 13 - 0
client/components/cards/minicard.styl

@@ -94,6 +94,19 @@
   .minicard-custom-field-item
     max-width:50%;
     flex-grow:1;
+  .handle
+    width: 20px;
+    height: 20px;
+    position: absolute;
+    right: 5px;
+    top: 5px;
+    display:none;
+    @media only screen and (max-width: 1199px) {
+      display:block;
+    }
+    .fa-arrows
+      font-size:20px;
+      color: #ccc;
   .minicard-title
     p:last-child
       margin-bottom: 0

+ 7 - 0
client/components/lists/list.js

@@ -26,6 +26,13 @@ BlazeComponent.extendComponent({
 
     const itemsSelector = '.js-minicard:not(.placeholder, .js-card-composer)';
     const $cards = this.$('.js-minicards');
+
+    if(window.matchMedia('(max-width: 1199px)').matches) {
+      $( '.js-minicards' ).sortable({
+        handle: '.handle',
+      });
+    }
+
     $cards.sortable({
       connectWith: '.js-minicards:not(.js-list-full)',
       tolerance: 'pointer',