diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-09-25 23:05:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-25 23:05:54 +0200 |
| commit | 3b60832214fdd9d8b5fd01e9a177a6dde5259907 (patch) | |
| tree | 7685a3e67baf1ed4caff4eef62ab2e724a58801e /app | |
| parent | 259181c41a5b6d4654e4e956490a3e4120bc9920 (diff) | |
New error page graphic. Other error page improvements (#5099)
- 500.html generated with admin-set default locale if set - Error page `<title>` includes Mastodon site title - 500 title changed to "This page is not correct" (ref: <https://www.youtube.com/watch?v=2VCAP_seh1A>) - 500 content appended with "on our end" to make clear it's not user's fault
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/styles/basics.scss | 5 | ||||
| -rw-r--r-- | app/views/errors/500.html.haml | 4 | ||||
| -rw-r--r-- | app/views/layouts/error.html.haml | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/app/javascript/styles/basics.scss b/app/javascript/styles/basics.scss index 48652a035..96f0023c3 100644 --- a/app/javascript/styles/basics.scss +++ b/app/javascript/styles/basics.scss @@ -70,9 +70,8 @@ body { .dialog img { display: block; - margin: 20px auto; - margin-top: 50px; - max-width: 600px; + margin: 0 auto; + max-width: 470px; width: 100%; height: auto; } diff --git a/app/views/errors/500.html.haml b/app/views/errors/500.html.haml index e124be551..6244ff209 100644 --- a/app/views/errors/500.html.haml +++ b/app/views/errors/500.html.haml @@ -1,5 +1,5 @@ - content_for :page_title do - = t('errors.500') + = t('errors.500.title') - content_for :content do - = t('errors.500') + = t('errors.500.content') diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml index 0b5f908ae..31f322096 100644 --- a/app/views/layouts/error.html.haml +++ b/app/views/layouts/error.html.haml @@ -3,12 +3,12 @@ %head %meta{ content: 'text/html; charset=UTF-8', 'http-equiv' => 'Content-Type' }/ %meta{ charset: 'utf-8' }/ - %title= yield :page_title + %title= safe_join([yield(:page_title), title], ' - ') %meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/ = stylesheet_pack_tag 'common', media: 'all' = stylesheet_pack_tag Setting.default_settings['theme'], media: 'all' %body.error .dialog - %img{ alt: 'Mastodon', src: '/oops.png' }/ + %img{ alt: title, src: '/oops.gif' }/ %div %h1= yield :content |