diff options
| author | ThibG <thib@sitedethib.com> | 2019-02-17 15:13:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-17 15:13:17 +0100 |
| commit | a2b4b82f0fdcae4757d169c706262926f4e53c6b (patch) | |
| tree | 67c9a6911be625bf3e10a65a1454f6631d08d93d /app/views | |
| parent | ab9082b3325dfd193d7130d6c880e85ab2781bc0 (diff) | |
| parent | e31fc2b458579fea3602e25a798d1f3cfcac2807 (diff) | |
Merge pull request #918 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/error.html.haml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml index d662d85e2..f8315afb5 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' }) + = render partial: 'layouts/theme', object: (@theme || { pack: 'error', flavour: 'glitch', common: { 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 |