diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-12-21 21:09:31 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-12-21 21:09:31 +0200 |
commit | 32d5a1d3f72ad46b792a3e1c4e4a5a3079cabd58 (patch) | |
tree | c41c9c3ffcd938015416f324e3a2a6698c6d76de | |
parent | db44b8ea54ef8c8296ba864e699775456c311437 (diff) | |
parent | b94bd73d33e39d7c2af15668dd15ea21edea5cc1 (diff) | |
download | wekan-32d5a1d3f72ad46b792a3e1c4e4a5a3079cabd58.tar.gz wekan-32d5a1d3f72ad46b792a3e1c4e4a5a3079cabd58.tar.bz2 wekan-32d5a1d3f72ad46b792a3e1c4e4a5a3079cabd58.zip |
Merge branch 'ui-feature-drag-handler' of https://github.com/hupptechnologies/wekan into hupptechnologies-ui-feature-drag-handler
-rw-r--r-- | .meteor/versions | 4 | ||||
-rw-r--r-- | client/components/cards/minicard.jade | 2 | ||||
-rw-r--r-- | client/components/cards/minicard.styl | 13 | ||||
-rw-r--r-- | client/components/lists/list.js | 7 |
4 files changed, 22 insertions, 4 deletions
diff --git a/.meteor/versions b/.meteor/versions index e09ff33f..8c5c1569 100644 --- a/.meteor/versions +++ b/.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 diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade index f23e91b3..0dfcee44 100644 --- a/client/components/cards/minicard.jade +++ b/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 ' > ' }} diff --git a/client/components/cards/minicard.styl b/client/components/cards/minicard.styl index 8fec7238..7ad51161 100644 --- a/client/components/cards/minicard.styl +++ b/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 diff --git a/client/components/lists/list.js b/client/components/lists/list.js index 00908faa..043cb77c 100644 --- a/client/components/lists/list.js +++ b/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', |