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

Update line-resolve-all checkmark to be green when all discussions resolved 

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/37465

Related MRs
 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13821
 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14042
This commit is contained in:
Eric Eastwood 2017-09-13 11:08:12 -05:00
parent e21c12375a
commit 066ce8976c
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -778,6 +778,7 @@ ul.notes {
background-color: transparent;
border: none;
outline: 0;
color: $gray-darkest;
transition: color $general-hover-transition-duration $general-hover-transition-curve;
&.is-disabled {
@ -801,7 +802,7 @@ ul.notes {
}
svg {
fill: $gray-darkest;
fill: currentColor;
height: 16px;
width: 16px;
}

5
app/views/projects/merge_requests/show.html.haml
View File

@ -62,7 +62,10 @@
":class" => "{ 'has-next-btn': !loggedOut && resolvedDiscussionCount !== discussionCount }" }
%span.line-resolve-btn.is-disabled{ type: "button",
":class" => "{ 'is-active': resolvedDiscussionCount === discussionCount }" }
= render "shared/icons/icon_status_success.svg"
%template{ 'v-if' => 'resolvedDiscussionCount === discussionCount' }
= render 'shared/icons/icon_status_success_solid.svg'
%template{ 'v-else' => '' }
= render 'shared/icons/icon_resolve_discussion.svg'
%span.line-resolve-text
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
= render "discussions/new_issue_for_all_discussions", merge_request: @merge_request

6
changelogs/unreleased/37465-fix-line-resolve-all-green-checkmark-icon.yml Normal file
View File

@ -0,0 +1,6 @@
---
title: Update x/x discussions resolved checkmark icon to be green when all discussions
resolved
merge_request:
author:
type: fixed