Merge remote-tracking branch 'parent/main' into upstream-20240327

This commit is contained in:
KMY 2024-03-27 12:13:55 +09:00
commit ace193fda3
75 changed files with 435 additions and 462 deletions

View file

@ -166,6 +166,15 @@ module ApplicationHelper
output.compact_blank.join(' ')
end
def theme_style_tags(theme)
if theme == 'system'
concat stylesheet_pack_tag('mastodon-light', media: 'not all and (prefers-color-scheme: dark)', crossorigin: 'anonymous')
concat stylesheet_pack_tag('default', media: '(prefers-color-scheme: dark)', crossorigin: 'anonymous')
else
stylesheet_pack_tag theme, media: 'all', crossorigin: 'anonymous'
end
end
def cdn_host
Rails.configuration.action_controller.asset_host
end