summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-12-21 21:52:42 +0200
committerLauri Ojansivu <x@xet7.org>2018-12-21 21:52:42 +0200
commit32d405bca4cc0337289fdeff8c66c5c1e2a205d3 (patch)
tree1637e4737130c49e32a2a77525872849ca5ae216
parentdb44b8ea54ef8c8296ba864e699775456c311437 (diff)
parent2f747fc09df4a08bcb6d5353a022f2a68aa70ed2 (diff)
downloadwekan-32d405bca4cc0337289fdeff8c66c5c1e2a205d3.tar.gz
wekan-32d405bca4cc0337289fdeff8c66c5c1e2a205d3.tar.bz2
wekan-32d405bca4cc0337289fdeff8c66c5c1e2a205d3.zip
Merge branch 'hupptechnologies-ui-feature-drag-handler' into devel
-rw-r--r--client/components/cards/minicard.jade2
-rw-r--r--client/components/cards/minicard.styl13
-rw-r--r--client/components/lists/list.js7
3 files changed, 22 insertions, 0 deletions
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',