diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-02-28 16:35:56 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-02-28 16:35:56 +0200 |
commit | daf1a67dc26f48efffca3f6a05fc607184ee7bab (patch) | |
tree | 653bc7d59c88ea1cec03a28d62606d1019287e5a /client/components/boards | |
parent | e44c46bcd2513440f70476b7299ae0f830e7c619 (diff) | |
parent | 284fac043b419de1a02edb6a7ec4cd9d49d7cce9 (diff) | |
download | wekan-daf1a67dc26f48efffca3f6a05fc607184ee7bab.tar.gz wekan-daf1a67dc26f48efffca3f6a05fc607184ee7bab.tar.bz2 wekan-daf1a67dc26f48efffca3f6a05fc607184ee7bab.zip |
Merge branch 'devel'
Diffstat (limited to 'client/components/boards')
-rw-r--r-- | client/components/boards/boardBody.jade | 2 | ||||
-rw-r--r-- | client/components/boards/boardBody.styl | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/client/components/boards/boardBody.jade b/client/components/boards/boardBody.jade index 30e70b31..dd71857a 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( + .board-canvas.js-swimlanes( 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 359aaf96..e56df352 100644 --- a/client/components/boards/boardBody.styl +++ b/client/components/boards/boardBody.styl @@ -23,15 +23,6 @@ position() &.is-sibling-sidebar-open margin-right: 248px - .swimlane - 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 - .board-overlay position: fixed-cover top: -100px |