diff options
| author | Lauri Ojansivu <x@xet7.org> | 2018-03-01 01:02:46 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2018-03-01 01:02:46 +0200 |
| commit | 4994f66e9c85dca922211c3adab221bdcfed97a1 (patch) | |
| tree | 979761dba43aa8e131d2715da24e18ffc7d750c8 | |
| parent | 91bab1c274498dac6e10ec9599a782f6481b8f40 (diff) | |
| parent | a23d93391b5488c2e9f927992a27d7a884afcf4a (diff) | |
| download | wekan-4994f66e9c85dca922211c3adab221bdcfed97a1.tar.gz wekan-4994f66e9c85dca922211c3adab221bdcfed97a1.tar.bz2 wekan-4994f66e9c85dca922211c3adab221bdcfed97a1.zip | |
Merge branch 'devel'
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | client/components/boards/boardBody.jade | 2 | ||||
| -rw-r--r-- | client/components/boards/boardBody.styl | 2 | ||||
| -rw-r--r-- | client/components/lists/list.styl | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d3e10693..bff473e2 100644 --- a/CHANGELOG.md +++ b/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. 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 |