diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2019-01-11 19:08:43 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2019-01-11 19:08:43 +0000 |
| commit | 7e8712e29993e5ae06b48c34723bfcbe3597e573 (patch) | |
| tree | 7fd530a1e1b01d89b4b781fb0d9d125834286555 | |
| parent | fe4f8cad21155c53aaf07a137d27bec9039a6379 (diff) | |
| parent | 1daa2c4ad5fce4c0913486779b4b06a100d1fc2c (diff) | |
| download | gitlab-ce-7e8712e29993e5ae06b48c34723bfcbe3597e573.tar.gz | |
Merge branch 'winh-add-list-dropdown-height' into 'master'
Adjust height of "Add list" dropdown in issue boards
Closes #56077
See merge request gitlab-org/gitlab-ce!24227
4 files changed, 10 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index afcb230797a..cb01a41cb7e 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -32,6 +32,10 @@ max-height: $dropdown-max-height; overflow-y: auto; + &.dropdown-extended-height { + max-height: 400px; + } + @include media-breakpoint-down(xs) { width: 100%; } diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss index 37984a8666f..c5a0eaaf704 100644 --- a/app/assets/stylesheets/pages/boards.scss +++ b/app/assets/stylesheets/pages/boards.scss @@ -29,10 +29,6 @@ .dropdown-menu-issues-board-new { width: 320px; - .open & { - max-height: 400px; - } - .dropdown-content { max-height: 162px; } diff --git a/app/views/shared/issuable/_board_create_list_dropdown.html.haml b/app/views/shared/issuable/_board_create_list_dropdown.html.haml index 4597d9439fa..fd413bd68c8 100644 --- a/app/views/shared/issuable/_board_create_list_dropdown.html.haml +++ b/app/views/shared/issuable/_board_create_list_dropdown.html.haml @@ -1,7 +1,7 @@ .dropdown.prepend-left-10#js-add-list %button.btn.btn-success.btn-inverted.js-new-board-list{ type: "button", data: board_list_data } Add list - .dropdown-menu.dropdown-menu-paging.dropdown-menu-right.dropdown-menu-issues-board-new.dropdown-menu-selectable.js-tab-container-labels + .dropdown-menu.dropdown-extended-height.dropdown-menu-paging.dropdown-menu-right.dropdown-menu-issues-board-new.dropdown-menu-selectable.js-tab-container-labels = render partial: "shared/issuable/label_page_default", locals: { show_footer: true, show_create: true, show_boards_content: true, title: "Add list" } - if can?(current_user, :admin_label, board.parent) = render partial: "shared/issuable/label_page_create" diff --git a/changelogs/unreleased/winh-add-list-dropdown-height.yml b/changelogs/unreleased/winh-add-list-dropdown-height.yml new file mode 100644 index 00000000000..6bcedc15cc9 --- /dev/null +++ b/changelogs/unreleased/winh-add-list-dropdown-height.yml @@ -0,0 +1,5 @@ +--- +title: Adjust height of "Add list" dropdown in issue boards +merge_request: 24227 +author: +type: fixed |