mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-25 23:41:37 +01:00
a6147a831f
Conflicts: - `app/lib/themes.rb` - `app/views/layouts/application.html.haml` - `app/views/layouts/embedded.html.haml` - `app/views/layouts/error.html.haml` - `config/settings.yml` All these conflicts are because glitch-soc and upstream have different theming systems and upstream changed a few things to have dynamic theme selection based on system settings. Conflicts were solved to take that into account, and `current_theme` has been changed in the process to return a tuple of `[flavour, skin]` to be used in the `theme_style_tags` helper.
49 lines
2 KiB
Text
Executable file
49 lines
2 KiB
Text
Executable file
!!! 5
|
|
%html{ lang: I18n.locale }
|
|
%head
|
|
%meta{ charset: 'utf-8' }/
|
|
%meta{ name: 'viewport', content: 'width=device-width, initial-scale=1' }/
|
|
|
|
- if cdn_host?
|
|
%link{ rel: 'dns-prefetch', href: cdn_host }/
|
|
%meta{ name: 'cdn-host', content: cdn_host }/
|
|
|
|
- if storage_host?
|
|
%link{ rel: 'dns-prefetch', href: storage_host }/
|
|
|
|
%link{ rel: 'icon', href: '/favicon.ico', type: 'image/x-icon' }/
|
|
|
|
- %w(16 32 48).each do |size|
|
|
%link{ rel: 'icon', sizes: "#{size}x#{size}", href: frontend_asset_path("icons/favicon-#{size}x#{size}.png"), type: 'image/png' }/
|
|
|
|
- %w(57 60 72 76 114 120 144 152 167 180 1024).each do |size|
|
|
%link{ rel: 'apple-touch-icon', sizes: "#{size}x#{size}", href: frontend_asset_path("icons/apple-touch-icon-#{size}x#{size}.png") }/
|
|
|
|
%link{ rel: 'mask-icon', href: frontend_asset_path('images/logo-symbol-icon.svg'), color: '#6364FF' }/
|
|
%link{ rel: 'manifest', href: manifest_path(format: :json) }/
|
|
%meta{ name: 'theme-color', content: '#191b22' }/
|
|
%meta{ name: 'apple-mobile-web-app-capable', content: 'yes' }/
|
|
|
|
%title= html_title
|
|
|
|
= flavoured_stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous' # upstream uses `common` but that's implicitly defined
|
|
= theme_style_tags current_theme
|
|
|
|
-# Needed for the wicg-inert polyfill. It needs to be on it's own <style> tag, with this `id`
|
|
= flavoured_stylesheet_pack_tag 'inert', media: 'all', id: 'inert-style'
|
|
|
|
= javascript_pack_tag 'common', crossorigin: 'anonymous'
|
|
= preload_locale_pack
|
|
= csrf_meta_tags unless skip_csrf_meta_tags?
|
|
%meta{ name: 'style-nonce', content: request.content_security_policy_nonce }
|
|
|
|
= stylesheet_link_tag custom_css_path, skip_pipeline: true, host: root_url, media: 'all'
|
|
|
|
= yield :header_tags
|
|
|
|
%body{ class: body_classes }
|
|
= content_for?(:content) ? yield(:content) : yield
|
|
|
|
.logo-resources{ 'tabindex' => '-1', 'inert' => true, 'aria-hidden' => true }
|
|
= inline_svg_tag 'logo-symbol-icon.svg'
|
|
= inline_svg_tag 'logo-symbol-wordmark.svg'
|