mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-12-01 12:30:16 -05:00
12b935fadf
Conflicts: - `.github/dependabot.yml`: Updated upstream, removed in glitch-soc to disable noise. Kept removed. - `CODE_OF_CONDUCT.md`: Upstream updated to a new version of the covenant, but I have not read it yet, so kept unchanged. - `Gemfile.lock`: Not a real conflict, one upstream dependency updated textually too close to the glitch-soc only `hcaptcha` dependency. Applied upstream changes. - `app/controllers/admin/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/disputes/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/relationships_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/statuses_cleanup_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/helpers/application_helper.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream added a highlight animation for onboarding, while we changed the max character limit. Applied our local changes on top of upstream's new version. - `app/views/layouts/application.html.haml`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `stylelint.config.js`: Upstream added ignore paths, glitch-soc had extra ignore paths. Added the same paths as upstream.
54 lines
2.3 KiB
Plaintext
Executable File
54 lines
2.3 KiB
Plaintext
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: asset_pack_path("media/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: asset_pack_path("media/icons/apple-touch-icon-#{size}x#{size}.png") }/
|
|
|
|
%link{ rel: 'mask-icon', href: asset_pack_path('media/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= content_for?(:page_title) ? safe_join([yield(:page_title).chomp.html_safe, title], ' - ') : title
|
|
|
|
= javascript_pack_tag "locales", crossorigin: 'anonymous'
|
|
- if @theme
|
|
- if @theme[:supported_locales].include? I18n.locale.to_s
|
|
= javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", crossorigin: 'anonymous'
|
|
- elsif @theme[:supported_locales].include? 'en'
|
|
= javascript_pack_tag "locales/#{@theme[:flavour]}/en", crossorigin: 'anonymous'
|
|
= csrf_meta_tags unless skip_csrf_meta_tags?
|
|
%meta{ name: 'style-nonce', content: request.content_security_policy_nonce }
|
|
|
|
= stylesheet_link_tag '/inert.css', skip_pipeline: true, media: 'all', id: 'inert-style'
|
|
|
|
= yield :header_tags
|
|
|
|
-# These must come after :header_tags to ensure our initial state has been defined.
|
|
= render partial: 'layouts/theme', object: @core
|
|
= render partial: 'layouts/theme', object: @theme
|
|
|
|
= stylesheet_link_tag custom_css_path, skip_pipeline: true, host: root_url, media: 'all'
|
|
|
|
%body{ class: body_classes }
|
|
= content_for?(:content) ? yield(:content) : yield
|
|
|
|
.logo-resources{ 'tabindex' => '-1', 'inert' => true, 'aria-hidden' => true }
|
|
= render_symbol :icon
|
|
= render_symbol :wordmark
|