369a475a70
Conflicts: - app/serializers/rest/instance_serializer.rb - app/views/layouts/error.html.haml - public/oops.png Took our version (same as upstream but without the things that only make sense in an animation). Additional changes: - app/javascript/flavours/vanilla/theme.yml Include upstream's javascript in error pages.
16 lines
775 B
Text
16 lines
775 B
Text
!!!
|
|
%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' }/
|
|
= javascript_pack_tag "locales", integrity: true, crossorigin: 'anonymous'
|
|
= render partial: 'layouts/theme', object: (@core || { pack: 'common' })
|
|
= render partial: 'layouts/theme', object: (@theme || { pack: 'common', flavour: 'glitch', skin: 'default' })
|
|
%body.error
|
|
.dialog
|
|
.dialog__illustration
|
|
%img{ alt: Setting.default_settings['site_title'], src: '/oops.png' }/
|
|
.dialog__message
|
|
%h1= yield :content
|