diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-27 15:41:58 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-27 15:41:58 +0000 |
commit | 85dbefe8242afe76c2c00869fbcb2b09bccf3371 (patch) | |
tree | 95abbebadafe46532967ff65c174a8c712b43c4c | |
parent | ccf034d62c55f0cc0f1393b607736e422d34b30c (diff) | |
parent | e2ea3e5c84b32af405799b1f7158dfdc590db915 (diff) | |
download | gitlab-ce-85dbefe8242afe76c2c00869fbcb2b09bccf3371.tar.gz |
Merge branch '34115-unable-to-access-edit-comment-from-dropdown-menu-in-certain-screen-sizes' into 'master'
Resolve "Unable to access edit comment from dropdown menu in certain screen sizes"
Closes #34115
See merge request !12421
-rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 2 | ||||
-rw-r--r-- | spec/features/snippets/notes_on_personal_snippets_spec.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index f0dbe4249c5..53d5cf2f7bc 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -473,7 +473,7 @@ ul.notes { } .more-actions { - display: inline; + display: inline-block; .tooltip { white-space: nowrap; diff --git a/spec/features/snippets/notes_on_personal_snippets_spec.rb b/spec/features/snippets/notes_on_personal_snippets_spec.rb index d310e7501ec..c7e2e3d8a34 100644 --- a/spec/features/snippets/notes_on_personal_snippets_spec.rb +++ b/spec/features/snippets/notes_on_personal_snippets_spec.rb @@ -33,6 +33,7 @@ describe 'Comments on personal snippets', :js, feature: true do expect(page).to have_selector('.note-emoji-button') end + find('body').click # close dropdown open_more_actions_dropdown(snippet_notes[1]) page.within("#notes-list li#note_#{snippet_notes[1].id}") do |