meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-01-31 19:47:14 +00:00
Code Issues Releases Wiki Activity

Replaces legacy icon with SVG icon in conflict warning (#41952).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/trunk@23565 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu 2025-03-26 21:21:50 +00:00
parent 18e93c085b
commit aec053387e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/stylesheets/application.css
View File

@ -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;
}

1
app/views/issues/_conflict.html.erb
View File

@ -1,4 +1,5 @@
<div class="conflict">
<%= notice_icon('warning') %>
<%= l(:notice_issue_update_conflict) %>
<% if @conflict_journals.present? %>
<div class="conflict-details">