Merge branch…

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

Merge branch…
85dbefe8 · Annabel Dunstone Gray · ccf034d6 · e2ea3e5c · 85dbefe8 · 85dbefe8
Commit 85dbefe8 authored Jun 27, 2017 by Annabel Dunstone Gray
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

notes.scss app/assets/stylesheets/pages/notes.scss +1 -1

notes_on_personal_snippets_spec.rb spec/features/snippets/notes_on_personal_snippets_spec.rb +1 -0

No files found.
--- 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;

--- 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