Merge branch '37465-fix-line-resolve-all-green-checkmark-icon' into 'master'

Update "x/x discussions resolved" checkmark icon to be green when all discussions resolved

Closes #37465

See merge request gitlab-org/gitlab-ce!14255

app/assets/stylesheets/pages/notes.scss

@@ -766,6 +766,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 {
@@ -789,7 +790,7 @@ ul.notes {
   }
 
   svg {
-    fill: $gray-darkest;
+    fill: currentColor;
     height: 16px;
     width: 16px;
   }

app/views/projects/merge_requests/show.html.haml

@@ -60,7 +60,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

changelogs/unreleased/37465-fix-line-resolve-all-green-checkmark-icon.yml

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