summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-09-18 21:24:01 +0000
committerJose Ivan Vargas <jvargas@gitlab.com>2017-09-28 11:02:44 -0500
commitbc8a5795b73b55619e3ef6f6b2420a28af478ff1 (patch)
tree0e2f1a6383fcbf41823439e839d6945c35d3001b
parent9c57b3d722277b17af7729fd7b1a9adf05fd6728 (diff)
downloadgitlab-ce-bc8a5795b73b55619e3ef6f6b2420a28af478ff1.tar.gz
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
-rw-r--r--app/assets/stylesheets/pages/notes.scss3
-rw-r--r--app/views/projects/merge_requests/show.html.haml5
-rw-r--r--changelogs/unreleased/37465-fix-line-resolve-all-green-checkmark-icon.yml6
3 files changed, 12 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index fbfe5d3c682..701d89cf7fb 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/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;
}
diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml
index d27e121beb4..807216f4bcb 100644
--- a/app/views/projects/merge_requests/show.html.haml
+++ b/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
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