Commit aff037d6 authored by Jarek Ostrowski's avatar Jarek Ostrowski

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
parent 582500e3
...@@ -57,7 +57,7 @@ export default { ...@@ -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 }}
......
...@@ -135,7 +135,7 @@ export default { ...@@ -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>
......
...@@ -822,6 +822,7 @@ $note-form-margin-left: 72px; ...@@ -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; ...@@ -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 {
......
---
title: Add check circle filled icon for resolved comments
merge_request: 28663
author:
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment