From a033c35a3411902b9bf8f62a40cd68f641e573d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Manelli?= Date: Wed, 28 Feb 2018 15:48:36 -0300 Subject: Fix scrollbar inside list and outer scroll --- client/components/boards/boardBody.jade | 2 +- client/components/boards/boardBody.styl | 2 ++ client/components/lists/list.styl | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/client/components/boards/boardBody.jade b/client/components/boards/boardBody.jade index dd71857a..29a613b9 100644 --- a/client/components/boards/boardBody.jade +++ b/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}}") diff --git a/client/components/boards/boardBody.styl b/client/components/boards/boardBody.styl index e56df352..a614c7ed 100644 --- a/client/components/boards/boardBody.styl +++ b/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 diff --git a/client/components/lists/list.styl b/client/components/lists/list.styl index c3753360..589958f0 100644 --- a/client/components/lists/list.styl +++ b/client/components/lists/list.styl @@ -91,6 +91,7 @@ display: flex overflow-y: auto padding: 5px 11px + max-height: 350px; .minicards flex-grow: 1 -- cgit v1.2.3-1-g7c22