Merge branch 'devel'

8 files changed, 11 insertions, 12 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee9d7a3a..92ac011c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,9 @@ and fixes the following bugs:
 - [Snap: Adding network hooks for configure hook to fix security denials](https://github.com/wekan/wekan/commit/9084158aece8a642dc49bf7ecc2196bf9d1af63e);
 - [Snap: Fixing problem when mongodb was not started at install/refresh](https://github.com/wekan/wekan/commit/1be8e5625fd20797910009a8221ca706fd52ab11);
 - [Fix Add Card Button dissapearing when dragging](https://github.com/wekan/wekan/commit/58e5e9b308113e5a8af5166328a68a0aafcc2558);
-- [Fix Scrollbar near top of screen when using internet explorer on Win7](https://github.com/wekan/wekan/commit/128a356b9222fa0ed824b477c2d0e1e6a0368021).
+- [Fix Scrollbar near top of screen when using internet explorer on Win7](https://github.com/wekan/wekan/commit/128a356b9222fa0ed824b477c2d0e1e6a0368021);
+- [Fix scroll when dragging elements. Remove scrollbars from swimlanes.](https://github.com/wekan/wekan/commit/ed8471be9b79243b016a275e5b11a6912717fbb9);
+- [Partial fix for scroll bar inside cardDetails](https://github.com/wekan/wekan/commit/ac7d44f8a8d809cd94ed5ef3640473f34c72403b).
 
 Thanks to GitHub users andresmanelli, GhassenRjab, kubiko, lunatic4ever and xet7 for their contributions.
 
diff --git a/client/components/cards/cardDetails.styl b/client/components/cards/cardDetails.styl
index f209862c..c67522d1 100644
--- a/client/components/cards/cardDetails.styl
+++ b/client/components/cards/cardDetails.styl
@@ -2,7 +2,6 @@
 
 .card-details
   padding: 0 20px
-  height: 100%
   flex-shrink: 0
   flex-basis: 470px
   will-change: flex-basis
diff --git a/client/components/lists/list.js b/client/components/lists/list.js
index d715c002..081b1e50 100644
--- a/client/components/lists/list.js
+++ b/client/components/lists/list.js
@@ -103,7 +103,7 @@ BlazeComponent.extendComponent({
     $cards.sortable({
       connectWith: '.js-minicards:not(.js-list-full)',
       tolerance: 'pointer',
-      appendTo: 'body',
+      appendTo: '.board-canvas',
       helper(evt, item) {
         const helper = item.clone();
         if (MultiSelection.isActive()) {
@@ -119,7 +119,6 @@ BlazeComponent.extendComponent({
       },
       distance: 7,
       items: itemsSelector,
-      scroll: false,
       placeholder: 'minicard-wrapper placeholder',
       start(evt, ui) {
         ui.placeholder.height(ui.helper.height());
diff --git a/client/components/lists/list.styl b/client/components/lists/list.styl
index 839119ec..fa32ff6d 100644
--- a/client/components/lists/list.styl
+++ b/client/components/lists/list.styl
@@ -10,6 +10,7 @@
   // transparent, because that won't work during a list drag.
   background: darken(white, 13%)
   border-left: 1px solid darken(white, 20%)
+  border-bottom: 1px solid #CCC
   padding: 0
   float: left
 
diff --git a/client/components/swimlanes/swimlanes.js b/client/components/swimlanes/swimlanes.js
index bbfc9ca2..dacb487e 100644
--- a/client/components/swimlanes/swimlanes.js
+++ b/client/components/swimlanes/swimlanes.js
@@ -7,7 +7,7 @@ BlazeComponent.extendComponent({
 
     $swimlanesDom.sortable({
       tolerance: 'pointer',
-      appendTo: 'body',
+      appendTo: '.board-canvas',
       helper: 'clone',
       handle: '.js-swimlane-header',
       items: '.js-swimlane:not(.placeholder)',
diff --git a/client/components/swimlanes/swimlanes.styl b/client/components/swimlanes/swimlanes.styl
index 13257953..99edd414 100644
--- a/client/components/swimlanes/swimlanes.styl
+++ b/client/components/swimlanes/swimlanes.styl
@@ -4,13 +4,10 @@
   // Even if this background color is the same as the body we can't leave it
   // transparent, because that won't work during a swimlane drag.
   background: darken(white, 13%)
-  border-bottom: 1px solid #CCC
   display: flex
   flex-direction: row
-  margin: 0 0 10px
-  padding: 0 40px 5px 0
-  overflow-x: auto
-  overflow-y: hidden
+  overflow: 0;
+  max-height: 100%
 
   &.placeholder
     background-color: rgba(0, 0, 0, .2)
@@ -32,6 +29,7 @@
     flex-direction: row;
     flex: 0 0 50px;
     padding-bottom: 30px;
+    border-bottom: 1px solid #CCC
 
     .swimlane-header
       writing-mode: sideways-lr;
diff --git a/docker-compose.yml b/docker-compose.yml
index fd570e5a..a92651a7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2'
 services:
 
   wekandb:
-    image: mongo:3.2.18
+    image: mongo:3.2.19
     container_name: wekan-db
     restart: always
     command: mongod --smallfiles --oplogSize 128
diff --git a/snapcraft.yaml b/snapcraft.yaml
index e28987db..1de64b71 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -65,7 +65,7 @@ apps:
 
 parts:
     mongodb:
-        source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.18.tgz
+        source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.19.tgz
         plugin: dump
         stage-packages: [libssl1.0.0]
         filesets: