meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-02-06 09:03:25 +00:00
Code Issues Releases Wiki Activity

Drops icon-error and style the error icon from CSS (#23980).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/trunk@23092 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu 2024-09-29 19:19:53 +00:00
parent 083b80e8ea
commit c128e47a56
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/images/icons.svg
View File

@ -158,11 +158,6 @@
<path d="M3 7l9 6l.565 -.377m2.435 -1.623l6 -4"/>
<path d="M3 3l18 18"/>
</symbol>
<symbol viewBox="0 0 24 24" stroke-linecap="round" stroke-linejoin="round" id="icon--error">
<path d="M12 12m-9 0a9 9 0 1 0 18 0a9 9 0 1 0 -18 0"/>
<path d="M12 9v4"/>
<path d="M12 16v.01"/>
</symbol>
<symbol viewBox="0 0 24 24" stroke-linecap="round" stroke-linejoin="round" id="icon--fav">
<path d="M12 17.75l-6.172 3.245l1.179 -6.873l-5 -4.867l6.9 -1l3.086 -6.253l3.086 6.253l6.9 1l-5 4.867l1.179 6.873z"/>
</symbol>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

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

@ -1673,14 +1673,14 @@ a.icon:hover svg, a.icon-only:hover svg {
stroke: #c61a1a;
}
svg.icon-error {
stroke: #f37c60;
}
svg.icon-ok {
stroke: #5db651;
}
.icon-error svg.icon-svg {
stroke: #c61a1a
}
.icon-warning svg {
stroke: #e4bc4b;
}
@ -1771,7 +1771,7 @@ span.icon-label {
.icon-time-add:not(:has(svg)) { background-image: url(/time_add.png); }
.icon-stats:not(:has(svg)) { background-image: url(/stats.png); }
.icon-warning:not(:has(svg)) { background-image: url(/warning.png); }
.icon-error:not(svg) { background-image: url(/exclamation.png); }
.icon-error:not(:has(svg)) { background-image: url(/exclamation.png); }
.icon-fav:not(:has(svg)) { background-image: url(/fav.png); }
.icon-fav-off:not(:has(svg)) { background-image: url(/fav_off.png); }
.icon-reload:not(:has(svg)) { background-image: url(/reload.png); }
@ -1791,7 +1791,7 @@ span.icon-label {
.icon-email:not(:has(svg)) { background-image: url(/email.png); }
.icon-email-disabled:not(:has(svg)) { background-image: url(/email_disabled.png); }
.icon-email-add:not(:has(svg)) { background-image: url(/email_add.png); }
.icon-ok:not(svg) { background-image: url(/true.png); }
.icon-ok:not(:has(svg)) { background-image: url(/true.png); }
.icon-not-ok:not(svg) { background-image: url(/false.png); }
.icon-link-break:not(:has(svg)) { background-image: url(/link_break.png); }
.icon-list:not(:has(svg)) { background-image: url(/text_list_bullets.png); }

4
app/helpers/icons_helper.rb
View File

@ -57,11 +57,13 @@ module IconsHelper
def sprite_icon(icon_name, size: DEFAULT_ICON_SIZE, sprite: DEFAULT_SPRITE, css_class: nil)
sprite_path = "#{sprite}.svg"
css_classes = "s#{size} icon-svg"
css_classes += " #{css_class}" unless css_class.nil?
content_tag(
:svg,
content_tag(:use, '', { 'href' => "#{asset_path(sprite_path)}#icon--#{icon_name}" }),
class: "s#{size} icon-svg",
class: css_classes,
aria: {
hidden: true
}

6
app/views/admin/info.html.erb
View File

@ -6,7 +6,11 @@
<% @checklist.each do |label, result| %>
<tr>
<td class="name"><%= label.is_a?(Symbol) ? l(label) : label %></td>
<td class="tick"><%= result ? sprite_icon('checked', css_class: "icon-ok") : sprite_icon('error', css_class: "icon-error") %></td>
<td class="tick">
<span class="icon-only icon-<%= result ? "ok" : "error" %>">
<%= result ? sprite_icon('checked') : sprite_icon('warning') %>
</span>
</td>
</tr>
<% end %>
</table>