summaryrefslogtreecommitdiff
path: root/app/views/projects/notes
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-08-24 20:28:44 -0500
committerEric Eastwood <contact@ericeastwood.com>2017-08-25 11:00:49 -0500
commite85362d5fff886df3118630cbdc46e469322fbeb (patch)
tree37e3253dffde0b90b7e10195072d4dab7daba314 /app/views/projects/notes
parent24244d03b55bc7732b3362bab1e1cc7e04c2dabf (diff)
downloadgitlab-ce-e85362d5fff886df3118630cbdc46e469322fbeb.tar.gz
Update and fix resolvable note icons for easier recognition36582-fix-note-resolved-icon
Diffstat (limited to 'app/views/projects/notes')
-rw-r--r--app/views/projects/notes/_actions.html.haml8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/views/projects/notes/_actions.html.haml b/app/views/projects/notes/_actions.html.haml
index cb737d129f0..b04f5efe1f9 100644
--- a/app/views/projects/notes/_actions.html.haml
+++ b/app/views/projects/notes/_actions.html.haml
@@ -26,8 +26,12 @@
":title" => "buttonText",
":ref" => "'button'" }
- = icon('spin spinner', 'v-show' => 'loading', class: 'loading', 'aria-hidden' => 'true', 'aria-label' => 'Loading')
- %div{ 'v-show' => '!loading' }= render 'shared/icons/icon_status_success.svg'
+ = icon('spin spinner', 'v-if' => 'loading', class: 'loading', 'aria-hidden' => 'true', 'aria-label' => 'Loading')
+ %div{ 'v-else' => '' }
+ %template{ 'v-if' => 'isResolved' }
+ = render 'shared/icons/icon_status_success_solid.svg'
+ %template{ 'v-else' => '' }
+ = render 'shared/icons/icon_status_success.svg'
- if current_user
- if note.emoji_awardable?