Commit cd3c2586 authored by Clement Ho's avatar Clement Ho

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

Add new icon if resolved

Closes #61024

See merge request gitlab-org/gitlab-ce!28663
parents 82f39315 aff037d6
......@@ -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 }}
......
......@@ -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>
......
......@@ -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 {
......
---
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