diff options
author | Eric Eastwood <contact@ericeastwood.com> | 2017-09-13 11:08:12 -0500 |
---|---|---|
committer | Eric Eastwood <contact@ericeastwood.com> | 2017-09-13 11:11:15 -0500 |
commit | 066ce8976c49b7b445e0207bd4f309cde33f909a (patch) | |
tree | e808028d308f43b63c77cb281fa887a671ab6e42 /app | |
parent | e21c12375a1c636f58b1630c6906f702dbd56830 (diff) | |
download | gitlab-ce-066ce8976c49b7b445e0207bd4f309cde33f909a.tar.gz |
Update line-resolve-all checkmark to be green when all discussions resolved37465-fix-line-resolve-all-green-checkmark-icon
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
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 3 | ||||
-rw-r--r-- | app/views/projects/merge_requests/show.html.haml | 5 |
2 files changed, 6 insertions, 2 deletions
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 |