summaryrefslogtreecommitdiffstats
path: root/client/components
diff options
context:
space:
mode:
authorAndrés Manelli <andresmanelli@gmail.com>2018-02-28 15:48:36 -0300
committerAndrés Manelli <andresmanelli@gmail.com>2018-02-28 15:48:36 -0300
commita033c35a3411902b9bf8f62a40cd68f641e573d3 (patch)
tree84e40a5edce443048c21089902f4d8b949878b6e /client/components
parent48cd551a698dd86a969007a277ce6cb384e3b5ce (diff)
downloadwekan-a033c35a3411902b9bf8f62a40cd68f641e573d3.tar.gz
wekan-a033c35a3411902b9bf8f62a40cd68f641e573d3.tar.bz2
wekan-a033c35a3411902b9bf8f62a40cd68f641e573d3.zip
Fix scrollbar inside list and outer scroll
Diffstat (limited to 'client/components')
-rw-r--r--client/components/boards/boardBody.jade2
-rw-r--r--client/components/boards/boardBody.styl2
-rw-r--r--client/components/lists/list.styl1
3 files changed, 4 insertions, 1 deletions
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