diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-02-17 11:58:17 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-02-17 12:26:55 +0100 |
| commit | 369a475a7001677493b452b9aaea1141de442c53 (patch) | |
| tree | a0c81f0876c68827cfa0e856844054e53cb2e741 /app/views | |
| parent | ab9082b3325dfd193d7130d6c880e85ab2781bc0 (diff) | |
| parent | 147b4c2c3afacd6ad9d5c1353c072861eaca5fd2 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
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.
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/error.html.haml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml index d662d85e2..e9c474082 100644 --- a/app/views/layouts/error.html.haml +++ b/app/views/layouts/error.html.haml @@ -5,10 +5,12 @@ %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 - %img{ alt: Setting.default_settings['site_title'], src: current_user&.setting_auto_play_gif ? '/oops.gif' : '/oops.png' }/ - %div + .dialog__illustration + %img{ alt: Setting.default_settings['site_title'], src: '/oops.png' }/ + .dialog__message %h1= yield :content |