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:
parent
582500e394
commit
aff037d681
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Add check circle filled icon for resolved comments
|
||||
merge_request: 28663
|
||||
author:
|
||||
type: changed
|
||||
Loading…
Reference in New Issue