diff options
| author | Lauri Ojansivu <x@xet7.org> | 2018-03-07 08:17:16 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2018-03-07 08:17:16 +0200 |
| commit | 660b578ab3141b9f28792d6ca639abb722338c2f (patch) | |
| tree | 4da26109f67057c409949c70bf72fbba4c603575 /client/components/swimlanes | |
| parent | 594daa9cf8c7ec39b248b2f77c0d06e94cc71d54 (diff) | |
| parent | f7a9bafe4c22ca396e4ab82fd43313d8627fc28a (diff) | |
| download | wekan-660b578ab3141b9f28792d6ca639abb722338c2f.tar.gz wekan-660b578ab3141b9f28792d6ca639abb722338c2f.tar.bz2 wekan-660b578ab3141b9f28792d6ca639abb722338c2f.zip | |
Merge branch 'devel'
Diffstat (limited to 'client/components/swimlanes')
| -rw-r--r-- | client/components/swimlanes/swimlanes.js | 2 | ||||
| -rw-r--r-- | client/components/swimlanes/swimlanes.styl | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/client/components/swimlanes/swimlanes.js b/client/components/swimlanes/swimlanes.js index bbfc9ca2..dacb487e 100644 --- a/client/components/swimlanes/swimlanes.js +++ b/client/components/swimlanes/swimlanes.js @@ -7,7 +7,7 @@ BlazeComponent.extendComponent({ $swimlanesDom.sortable({ tolerance: 'pointer', - appendTo: 'body', + appendTo: '.board-canvas', helper: 'clone', handle: '.js-swimlane-header', items: '.js-swimlane:not(.placeholder)', diff --git a/client/components/swimlanes/swimlanes.styl b/client/components/swimlanes/swimlanes.styl index 13257953..99edd414 100644 --- a/client/components/swimlanes/swimlanes.styl +++ b/client/components/swimlanes/swimlanes.styl @@ -4,13 +4,10 @@ // Even if this background color is the same as the body we can't leave it // transparent, because that won't work during a swimlane drag. background: darken(white, 13%) - 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 + overflow: 0; + max-height: 100% &.placeholder background-color: rgba(0, 0, 0, .2) @@ -32,6 +29,7 @@ flex-direction: row; flex: 0 0 50px; padding-bottom: 30px; + border-bottom: 1px solid #CCC .swimlane-header writing-mode: sideways-lr; |