diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2019-08-22 15:24:11 +0200 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2019-08-22 19:01:24 +0200 |
| commit | ce99a593b730bb71a535e5558c3d642964e545b6 (patch) | |
| tree | 8487607a574e52c4523b8cf1202a74cbbc56712d | |
| parent | c3b0dc35d66c1fae3c37706acc7b45afb906d7be (diff) | |
| download | gitlab-ce-ce99a593b730bb71a535e5558c3d642964e545b6.tar.gz | |
Hide duplicate board list while dragging
| -rw-r--r-- | app/assets/stylesheets/pages/boards.scss | 3 | ||||
| -rw-r--r-- | app/views/shared/boards/components/_board.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/winh-deduplicate-board-headers.yml | 5 |
3 files changed, 9 insertions, 1 deletions
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) { diff --git a/app/views/shared/boards/components/_board.html.haml b/app/views/shared/boards/components/_board.html.haml index 5abd4ce0fb9..ffa24d1c041 100644 --- a/app/views/shared/boards/components/_board.html.haml +++ b/app/views/shared/boards/components/_board.html.haml @@ -1,4 +1,4 @@ -.board.d-inline-block.h-100.px-2.align-top.ws-normal{ ":class" => '{ "is-draggable": !list.preset, "is-expandable": list.isExpandable, "is-collapsed": !list.isExpanded, "board-type-assignee": list.type === "assignee" }', +.board.h-100.px-2.align-top.ws-normal{ ":class" => '{ "is-draggable": !list.preset, "is-expandable": list.isExpandable, "is-collapsed": !list.isExpanded, "board-type-assignee": list.type === "assignee" }', ":data-id" => "list.id", data: { qa_selector: "board_list" } } .board-inner.d-flex.flex-column.position-relative.h-100.rounded %header.board-header{ ":class" => '{ "has-border": list.label && list.label.color, "position-relative": list.isExpanded, "position-absolute position-top-0 position-left-0 w-100 h-100": !list.isExpanded }', ":style" => "{ borderTopColor: (list.label && list.label.color ? list.label.color : null) }", data: { qa_selector: "board_list_header" } } diff --git a/changelogs/unreleased/winh-deduplicate-board-headers.yml b/changelogs/unreleased/winh-deduplicate-board-headers.yml new file mode 100644 index 00000000000..009ce59b6bc --- /dev/null +++ b/changelogs/unreleased/winh-deduplicate-board-headers.yml @@ -0,0 +1,5 @@ +--- +title: Hide duplicate board list while dragging +merge_request: 32099 +author: +type: fixed |