From 066ce8976c49b7b445e0207bd4f309cde33f909a Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Wed, 13 Sep 2017 11:08:12 -0500
Subject: 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
---
 app/assets/stylesheets/pages/notes.scss                             | 3 ++-
 app/views/projects/merge_requests/show.html.haml                    | 5 ++++-
 .../unreleased/37465-fix-line-resolve-all-green-checkmark-icon.yml  | 6 ++++++
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/unreleased/37465-fix-line-resolve-all-green-checkmark-icon.yml

diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index e437bad4912..052c005a2e8 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -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;
   }
diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml
index c2d16f7e731..d3742f3e4be 100644
--- a/app/views/projects/merge_requests/show.html.haml
+++ b/app/views/projects/merge_requests/show.html.haml
@@ -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
diff --git a/changelogs/unreleased/37465-fix-line-resolve-all-green-checkmark-icon.yml b/changelogs/unreleased/37465-fix-line-resolve-all-green-checkmark-icon.yml
new file mode 100644
index 00000000000..24b1d201409
--- /dev/null
+++ b/changelogs/unreleased/37465-fix-line-resolve-all-green-checkmark-icon.yml
@@ -0,0 +1,6 @@
+---
+title: Update x/x discussions resolved checkmark icon to be green when all discussions
+  resolved
+merge_request:
+author:
+type: fixed
-- 
cgit v1.2.1