Fix invalid `mask-icon` when a custom instance icon is configured (#30734)

2024-06-17 11:00:26 +02:00 · 2024-06-17 11:00:26 +02:00 · 43bbdea421
parent 5addffb604
commit 43bbdea421
2 changed files with 6 additions and 1 deletions
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -256,6 +256,10 @@ module ApplicationHelper
    instance_presenter.app_icon&.file&.url(size)
  end

+  def use_mask_icon?
+    instance_presenter.app_icon.blank?
+  end
+
  private

  def storage_host_var
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@ -19,6 +19,7 @@
    - SiteUpload::APPLE_ICON_SIZES.each do |size|
      %link{ rel: 'apple-touch-icon', sizes: "#{size}x#{size}", href: app_icon_path(size.to_i) || frontend_asset_path("icons/apple-touch-icon-#{size}x#{size}.png") }/

+    - if use_mask_icon?
      %link{ rel: 'mask-icon', href: frontend_asset_path('images/logo-symbol-icon.svg'), color: '#6364FF' }/
    %link{ rel: 'manifest', href: manifest_path(format: :json) }/
    = theme_color_tags current_theme