treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

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

main-rebase-security-fix
Renaud Chaput 2024-06-17 11:00:26 +02:00 committed by GitHub
parent 5addffb604
commit 43bbdea421
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/application_helper.rb
View File

@ -256,6 +256,10 @@ module ApplicationHelper
instance_presenter.app_icon&.file&.url(size) instance_presenter.app_icon&.file&.url(size)
end end
def use_mask_icon?
instance_presenter.app_icon.blank?
end
private private
def storage_host_var def storage_host_var

1
app/views/layouts/application.html.haml
View File

@ -19,6 +19,7 @@
- SiteUpload::APPLE_ICON_SIZES.each do |size| - 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") }/ %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: 'mask-icon', href: frontend_asset_path('images/logo-symbol-icon.svg'), color: '#6364FF' }/
%link{ rel: 'manifest', href: manifest_path(format: :json) }/ %link{ rel: 'manifest', href: manifest_path(format: :json) }/
= theme_color_tags current_theme = theme_color_tags current_theme