From 3bb333afc81130441db51b97887f818702e08118 Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Tue, 5 Sep 2017 12:00:50 +0000 Subject: [PATCH] Creates an icon only for the discussions and puts back the old SVG for CI status --- app/views/projects/notes/_actions.html.haml | 2 +- app/views/shared/icons/_icon_resolve_discussion.svg | 1 + app/views/shared/icons/_icon_status_success.svg | 2 +- changelogs/unreleased/37406-success-status-icon.yml | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 app/views/shared/icons/_icon_resolve_discussion.svg create mode 100644 changelogs/unreleased/37406-success-status-icon.yml diff --git a/app/views/projects/notes/_actions.html.haml b/app/views/projects/notes/_actions.html.haml index b04f5efe1f9..fb07141d2ac 100644 --- a/app/views/projects/notes/_actions.html.haml +++ b/app/views/projects/notes/_actions.html.haml @@ -31,7 +31,7 @@ %template{ 'v-if' => 'isResolved' } = render 'shared/icons/icon_status_success_solid.svg' %template{ 'v-else' => '' } - = render 'shared/icons/icon_status_success.svg' + = render 'shared/icons/icon_resolve_discussion.svg' - if current_user - if note.emoji_awardable? diff --git a/app/views/shared/icons/_icon_resolve_discussion.svg b/app/views/shared/icons/_icon_resolve_discussion.svg new file mode 100644 index 00000000000..845562e9320 --- /dev/null +++ b/app/views/shared/icons/_icon_resolve_discussion.svg @@ -0,0 +1 @@ + diff --git a/app/views/shared/icons/_icon_status_success.svg b/app/views/shared/icons/_icon_status_success.svg index 845562e9320..eed5006bebe 100755 --- a/app/views/shared/icons/_icon_status_success.svg +++ b/app/views/shared/icons/_icon_status_success.svg @@ -1 +1 @@ - + diff --git a/changelogs/unreleased/37406-success-status-icon.yml b/changelogs/unreleased/37406-success-status-icon.yml new file mode 100644 index 00000000000..faac947f188 --- /dev/null +++ b/changelogs/unreleased/37406-success-status-icon.yml @@ -0,0 +1,5 @@ +--- +title: Fix broken svg in jobs dropdown for success status +merge_request: +author: +type: fixed