From aec053387ead43e76444abd032aac1b16f878247 Mon Sep 17 00:00:00 2001
From: Marius Balteanu <marius.balteanu@zitec.com>
Date: Wed, 26 Mar 2025 21:21:50 +0000
Subject: [PATCH] Replaces legacy icon with SVG icon in conflict warning
 (#41952).

git-svn-id: https://svn.redmine.org/redmine/trunk@23565 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/assets/stylesheets/application.css | 6 +++---
 app/views/issues/_conflict.html.erb    | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index d9882f9ca..a8f27cb22 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -1194,7 +1194,7 @@ input.autocomplete.ajax-loading {
 }
 
 div.flash {margin-top: 8px;}
-div.flash svg.icon-svg, #errorExplanation svg.icon-svg {
+div.flash svg.icon-svg, #errorExplanation svg.icon-svg, .conflict svg.icon-svg {
   margin-right: 4px;
   margin-left: -26px;
 }
@@ -1241,10 +1241,10 @@ div.flash.warning, .conflict {
   color: #A6750C;
   text-align: left;
 }
-div.flash.warning:not(:has(svg)) {
+div.flash.warning:not(:has(svg)), .conflict:not(:has(svg)) {
   background: url(/warning.png) 8px 5px no-repeat #F3EDD1;
 }
-div.flash.warning svg.icon-svg {
+div.flash.warning svg.icon-svg, .conflict svg.icon-svg {
   stroke: #A6750C;
 }
 
diff --git a/app/views/issues/_conflict.html.erb b/app/views/issues/_conflict.html.erb
index ea4c35d7d..596584d14 100644
--- a/app/views/issues/_conflict.html.erb
+++ b/app/views/issues/_conflict.html.erb
@@ -1,4 +1,5 @@
 <div class="conflict">
+  <%= notice_icon('warning') %>
   <%= l(:notice_issue_update_conflict) %> 
   <% if @conflict_journals.present? %>
     <div class="conflict-details">