Merge branch 'devel'

CHANGELOG.md

@@ -7,7 +7,8 @@ This release fixes the following bugs:
 - [Fix lint errors related to trello creator](https://github.com/wekan/wekan/commit/951a0db380d60f3d948ae38d50b85a54983a51de);
 - [Fix lint errors related to language names](https://github.com/wekan/wekan/commit/c0d33d97f2c8d4e9371a03d4ad3022df3ed64d3d);
 - [Allow swimlanes reordering](https://github.com/wekan/wekan/commit/37c94622e476f50bf2387bc8b140454d66200e78);
-- [Avoid swimlane title overlap](https://github.com/wekan/wekan/commit/c4fa9010f34966b633c7bf7e46ad49fc101127c9).
+- [Avoid swimlane title overlap](https://github.com/wekan/wekan/commit/c4fa9010f34966b633c7bf7e46ad49fc101127c9);
+- [Fix scrollbar inside list and outer scroll](https://github.com/wekan/wekan/commit/a033c35a3411902b9bf8f62a40cd68f641e573d3).
 
 Thanks to GitHub users andresmanelli and GhassenRjab for their contributions.
 

client/components/boards/boardBody.jade

@@ -14,7 +14,7 @@ template(name="board")
 template(name="boardBody")
   .board-wrapper(class=currentBoard.colorClass)
     +sidebar
-    .board-canvas.js-swimlanes(
+    .board-canvas.js-swimlanes.js-perfect-scrollbar(
       class="{{#if Sidebar.isOpen}}is-sibling-sidebar-open{{/if}}"
       class="{{#if MultiSelection.isActive}}is-multiselection-active{{/if}}"
       class="{{#if draggingActive.get}}is-dragging-active{{/if}}")

client/components/boards/boardBody.styl

@@ -15,10 +15,12 @@ position()
 
 .board-wrapper
   position: cover
+  overflow-y: hidden;
 
   .board-canvas
     position: cover
     transition: margin .1s
+    overflow-y: auto;
 
     &.is-sibling-sidebar-open
       margin-right: 248px

client/components/lists/list.styl

@@ -91,6 +91,7 @@
   display: flex
   overflow-y: auto
   padding: 5px 11px
+  max-height: 350px;
 
   .minicards
     flex-grow: 1