Add new icon if resolved

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
This commit is contained in:
Jarek Ostrowski 2019-05-22 21:12:30 -04:00
parent 582500e394
commit aff037d681
4 changed files with 8 additions and 3 deletions

View File

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

View File

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

View File

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

View File

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