diff options
| author | Jarek Ostrowski <jarek.j.ostrowski@gmail.com> | 2019-05-22 21:12:30 -0400 |
|---|---|---|
| committer | Jarek Ostrowski <jarek.j.ostrowski@gmail.com> | 2019-05-29 13:23:33 -0400 |
| commit | aff037d681f35e80ff1e7e4a6ba8ba3db8025134 (patch) | |
| tree | 83a63b01d7ba730206ebb03d21b7e4740038e245 /app/assets/javascripts | |
| parent | 582500e39442076d0e718adf5c7c7dc17d91bd4a (diff) | |
| download | gitlab-ce-aff037d681f35e80ff1e7e4a6ba8ba3db8025134.tar.gz | |
Add new icon if resolved61024-update-resolved-icon
Remove unwanted change
Add changelog
Add check circle filled count widget
Change color for consistency
Remove resolve button class
Merge master
Change to single icon, conditional name
Remove authorship
Remove unnecessary added styles
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/notes/components/discussion_counter.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/notes/components/note_actions.vue | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes/components/discussion_counter.vue b/app/assets/javascripts/notes/components/discussion_counter.vue index c7cfc0f0f3b..307e56708e0 100644 --- a/app/assets/javascripts/notes/components/discussion_counter.vue +++ b/app/assets/javascripts/notes/components/discussion_counter.vue @@ -57,7 +57,7 @@ export default { class="line-resolve-btn is-disabled" type="button" > - <icon name="check-circle" /> + <icon :name="allResolved ? 'check-circle-filled' : 'check-circle'" /> </span> <span class="line-resolve-text"> {{ resolvedDiscussionsCount }}/{{ resolvableDiscussionsCount }} diff --git a/app/assets/javascripts/notes/components/note_actions.vue b/app/assets/javascripts/notes/components/note_actions.vue index 5a4ff15d198..78f397ccc12 100644 --- a/app/assets/javascripts/notes/components/note_actions.vue +++ b/app/assets/javascripts/notes/components/note_actions.vue @@ -135,7 +135,7 @@ export default { @click="onResolve" > <template v-if="!isResolving"> - <icon name="check-circle" /> + <icon :name="isResolved ? 'check-circle-filled' : 'check-circle'" /> </template> <gl-loading-icon v-else inline /> </button> |