diff options
author | Winnie Hellmann <winnie@gitlab.com> | 2019-08-23 11:40:56 +0000 |
---|---|---|
committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-08-23 11:40:56 +0000 |
commit | 8d5fac4f56bb6c0d6625ea5f6364796a80196933 (patch) | |
tree | ea0caf0e67f8fe5b676ab83b1d4203b5040e0f3f /app/assets | |
parent | 40295b25ab382f87f84e27a16f46be2345fe94c0 (diff) | |
download | gitlab-ce-8d5fac4f56bb6c0d6625ea5f6364796a80196933.tar.gz |
Hide duplicate board list while dragging
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/test_utils/simulate_drag.js | 6 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/boards.scss | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/javascripts/test_utils/simulate_drag.js b/app/assets/javascripts/test_utils/simulate_drag.js index be9ebc81c6b..c9bf234fcce 100644 --- a/app/assets/javascripts/test_utils/simulate_drag.js +++ b/app/assets/javascripts/test_utils/simulate_drag.js @@ -153,7 +153,11 @@ export default function simulateDrag(options) { if (progress >= 1) { if (options.ondragend) options.ondragend(); - simulateEvent(toEl, 'mouseup'); + + if (options.performDrop) { + simulateEvent(toEl, 'mouseup'); + } + clearInterval(dragInterval); window.SIMULATE_DRAG_ACTIVE = 0; } diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss index 343cca96851..e77a2d1e333 100644 --- a/app/assets/stylesheets/pages/boards.scss +++ b/app/assets/stylesheets/pages/boards.scss @@ -86,6 +86,9 @@ } .board { + // the next line cannot be replaced with .d-inline-block because it breaks display: none of SortableJS + // see https://gitlab.com/gitlab-org/gitlab-ce/issues/64828 + display: inline-block; width: calc(85vw - 15px); @include media-breakpoint-up(sm) { |