diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2019-05-29 15:30:39 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2019-05-29 15:30:39 +0000 |
| commit | 156998f61ab6bdcdd07906664bf982cda68075c6 (patch) | |
| tree | 763a80521d83e67bda80e7d7471364ff97eaa63b | |
| parent | ee277ce0b69680531f57dd3572b14877aaa79045 (diff) | |
| parent | 3141b800b74576d5b5dfc84a96353fea47ae974b (diff) | |
| download | gitlab-ce-156998f61ab6bdcdd07906664bf982cda68075c6.tar.gz | |
Merge branch '61639-flaky-spec-issue-boards-labels-creates-project-label-spec-features-boards-sidebar_spec-rb-350' into 'master'
Fix dropdown position when loading remote data
Closes #61639
See merge request gitlab-org/gitlab-ce!28526
4 files changed, 15 insertions, 2 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js b/app/assets/javascripts/gl_dropdown.js index 6a4c1aab308..a143d79097b 100644 --- a/app/assets/javascripts/gl_dropdown.js +++ b/app/assets/javascripts/gl_dropdown.js @@ -335,6 +335,10 @@ GitLabDropdown = (function() { _this.fullData = data; _this.parseData(_this.fullData); _this.focusTextInput(); + + // Update dropdown position since remote data may have changed dropdown size + _this.dropdown.find('.dropdown-menu-toggle').dropdown('update'); + if ( _this.options.filterable && _this.filter && diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index 8fb4027bf97..cd951f67293 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -570,10 +570,10 @@ } .dropdown-menu-close { - right: 5px; + top: $gl-padding-4; + right: $gl-padding-8; width: 20px; height: 20px; - top: -1px; } .dropdown-menu-close-icon { diff --git a/changelogs/unreleased/61639-flaky-spec-issue-boards-labels-creates-project-label-spec-features-boards-sidebar_spec-rb-350.yml b/changelogs/unreleased/61639-flaky-spec-issue-boards-labels-creates-project-label-spec-features-boards-sidebar_spec-rb-350.yml new file mode 100644 index 00000000000..9b4f13353f5 --- /dev/null +++ b/changelogs/unreleased/61639-flaky-spec-issue-boards-labels-creates-project-label-spec-features-boards-sidebar_spec-rb-350.yml @@ -0,0 +1,5 @@ +--- +title: Fix dropdown position when loading remote data +merge_request: 28526 +author: +type: fixed diff --git a/spec/features/boards/sidebar_spec.rb b/spec/features/boards/sidebar_spec.rb index 87c0dc40e5c..b1798c11361 100644 --- a/spec/features/boards/sidebar_spec.rb +++ b/spec/features/boards/sidebar_spec.rb @@ -352,6 +352,8 @@ describe 'Issue Boards', :js do page.within('.labels') do click_link 'Edit' + wait_for_requests + click_link 'Create project label' fill_in 'new_label_name', with: 'test label' first('.suggest-colors-dropdown a').click @@ -368,6 +370,8 @@ describe 'Issue Boards', :js do page.within('.labels') do click_link 'Edit' + wait_for_requests + click_link 'Create project label' fill_in 'new_label_name', with: 'test label' first('.suggest-colors-dropdown a').click |