Merge remote-tracking branch 'upstream/pull/4681'

This commit is contained in:
Tom Hughes 2024-04-11 18:37:20 +01:00
commit 8bb126938f
4 changed files with 16 additions and 3 deletions

View file

@ -1031,4 +1031,17 @@ div.secondary-actions {
margin-bottom: -1px;
}
/* Rules for traces */
img.trace_image {
mix-blend-mode: darken;
}
@include color-mode(dark) {
img.trace_image {
filter: invert(1);
mix-blend-mode: lighten;
}
}
@import 'browse';

View file

@ -2,7 +2,7 @@
<td>
<% if Settings.status != "gpx_offline" %>
<% if trace.inserted %>
<%= link_to image_tag(trace_icon_path(trace.user, trace), :alt => ""), show_trace_path(trace.user, trace) %>
<%= link_to image_tag(trace_icon_path(trace.user, trace), :alt => "", :class => "trace_image"), show_trace_path(trace.user, trace) %>
<% else %>
<span class="text-danger"><%= t ".pending" %></span>
<% end %>

View file

@ -2,7 +2,7 @@
<h1><%= t ".heading", :name => @trace.name %></h1>
<% end %>
<%= image_tag trace_picture_path(@trace.user, @trace) %>
<%= image_tag trace_picture_path(@trace.user, @trace), :class => "trace_image" %>
<%= bootstrap_form_for @trace do |f| %>
<%= f.text_field :name, :disabled => true %>

View file

@ -4,7 +4,7 @@
<% if Settings.status != "gpx_offline" %>
<% if @trace.inserted %>
<%= image_tag trace_picture_path(@trace.user, @trace) %>
<%= image_tag trace_picture_path(@trace.user, @trace), :class => "trace_image" %>
<% else %>
<span class="text-danger"><%= t ".pending" %></span>
<% end %>