diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-18 21:24:01 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-18 21:24:01 +0000 |
| commit | 0223d84e797c914542882646c4faa97760c1a21c (patch) | |
| tree | 7134d2b08cc99c0bf3eb5f728fcf91e62e47b886 | |
| parent | 727f51b8ef0af2b78087b4ac894ee728bfbabd1f (diff) | |
| parent | 066ce8976c49b7b445e0207bd4f309cde33f909a (diff) | |
| download | gitlab-ce-0223d84e797c914542882646c4faa97760c1a21c.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.scss | 3 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show.html.haml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/37465-fix-line-resolve-all-green-checkmark-icon.yml | 6 |
3 files changed, 12 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 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 |