mirror of
https://github.com/funamitech/mastodon
synced 2024-12-05 02:09:05 +09: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.
18 lines
817 B
Plaintext
18 lines
817 B
Plaintext
!!!
|
|
%html{ lang: I18n.locale }
|
|
%head
|
|
%meta{ 'content' => 'text/html; charset=UTF-8', 'http-equiv' => 'Content-Type' }/
|
|
%meta{ charset: 'utf-8' }/
|
|
%title= safe_join([yield(:page_title), Setting.default_settings['site_title']], ' - ')
|
|
%meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/
|
|
= flavoured_stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous' # upstream uses `common` but that's implicitly defined
|
|
= theme_style_tags current_theme
|
|
= javascript_pack_tag 'common', crossorigin: 'anonymous'
|
|
= flavoured_javascript_pack_tag 'error', crossorigin: 'anonymous'
|
|
%body.error
|
|
.dialog
|
|
.dialog__illustration
|
|
%img{ alt: Setting.default_settings['site_title'], src: '/oops.png' }/
|
|
.dialog__message
|
|
%h1= yield :content
|