diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-04-13 15:36:03 +0000 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2017-04-14 14:54:40 -0300 |
| commit | 46dcafaf1f42b4abb8a32f689504af46cabef3c8 (patch) | |
| tree | 42cbe00a4e7927e6c4bd2fa20b763c0862befd9c | |
| parent | 0255f3fba5b0e4f02c9cb5905008f63863f7172d (diff) | |
| download | gitlab-ce-46dcafaf1f42b4abb8a32f689504af46cabef3c8.tar.gz | |
Merge branch '30622-resolve-note-loading-icon-gone' into 'master'
Resolve "Resolve note loading icon gone"
Closes #30622
See merge request !10628
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 6 | ||||
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 5 | ||||
| -rw-r--r-- | spec/features/merge_requests/diff_notes_resolve_spec.rb | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index ad0f2f6efbb..c78fb8ede79 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -627,7 +627,6 @@ ul.notes { } &:not(.is-disabled):hover, - &:not(.is-disabled):focus, &.is-active { color: $gl-text-green; @@ -641,6 +640,11 @@ ul.notes { height: 15px; width: 15px; } + + .loading { + margin: 0; + height: auto; + } } .discussion-next-btn { diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index c12c05eeb73..1f021ad77e5 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -52,11 +52,10 @@ ":aria-label" => "buttonText", "@click" => "resolve", ":title" => "buttonText", - "v-show" => "!loading", ":ref" => "'button'" } - = icon("spin spinner", "v-show" => "loading") - = render "shared/icons/icon_status_success.svg" + = icon("spin spinner", "v-show" => "loading", class: 'loading') + %div{ 'v-show' => '!loading' }= render "shared/icons/icon_status_success.svg" - if current_user - if note.emoji_awardable? diff --git a/spec/features/merge_requests/diff_notes_resolve_spec.rb b/spec/features/merge_requests/diff_notes_resolve_spec.rb index 88d28b649a4..0e23c3a8849 100644 --- a/spec/features/merge_requests/diff_notes_resolve_spec.rb +++ b/spec/features/merge_requests/diff_notes_resolve_spec.rb @@ -198,6 +198,8 @@ feature 'Diff notes resolve', feature: true, js: true do it 'does not mark discussion as resolved when resolving single note' do page.first '.diff-content .note' do first('.line-resolve-btn').click + + expect(page).to have_selector('.note-action-button .loading') expect(first('.line-resolve-btn')['data-original-title']).to eq("Resolved by #{user.name}") end |