kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '61024-update-resolved-icon' into 'master' 

Add new icon if resolved

Closes #61024

See merge request gitlab-org/gitlab-ce!28663
This commit is contained in:
Clement Ho 2019-05-29 22:37:25 +00:00
parent 82f39315b1 aff037d681
commit cd3c2586ed
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/notes/components/discussion_counter.vue
View File

@ -57,7 +57,7 @@ export default {
class="line-resolve-btn is-disabled" class="line-resolve-btn is-disabled"
type="button" type="button"
> >
<icon name="check-circle" /> <icon :name="allResolved ? 'check-circle-filled' : 'check-circle'" />
</span> </span>
<span class="line-resolve-text"> <span class="line-resolve-text">
{{ resolvedDiscussionsCount }}/{{ resolvableDiscussionsCount }} {{ resolvedDiscussionsCount }}/{{ resolvableDiscussionsCount }}

2
app/assets/javascripts/notes/components/note_actions.vue
View File

@ -135,7 +135,7 @@ export default {
@click="onResolve" @click="onResolve"
> >
<template v-if="!isResolving"> <template v-if="!isResolving">
<icon name="check-circle" /> <icon :name="isResolved ? 'check-circle-filled' : 'check-circle'" />
</template> </template>
<gl-loading-icon v-else inline /> <gl-loading-icon v-else inline />
</button> </button>

2
app/assets/stylesheets/pages/notes.scss
View File

@ -822,6 +822,7 @@ $note-form-margin-left: 72px;
.line-resolve-btn { .line-resolve-btn {
margin-right: 5px; margin-right: 5px;
color: $gray-darkest;
svg { svg {
vertical-align: middle; vertical-align: middle;
@ -836,7 +837,6 @@ $note-form-margin-left: 72px;
background-color: transparent; background-color: transparent;
border: 0; border: 0;
outline: 0; outline: 0;
color: $gray-darkest;
transition: color $general-hover-transition-duration $general-hover-transition-curve; transition: color $general-hover-transition-duration $general-hover-transition-curve;
&.is-disabled { &.is-disabled {

5
changelogs/unreleased/61024-update-resolved-icon.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Add check circle filled icon for resolved comments
merge_request: 28663
author:
type: changed