cybrespace
/
mastodon
4
3
Fork 3
Code Issues 7 Pull Requests Releases Activity

Change error graphic to hover-to-play (#10055) 

Fix #6060
This commit is contained in:
Eugen Rochko 2019-02-15 23:33:25 +01:00 committed by GitHub
parent 71e28ba399
commit 80388a3ffe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/javascript/packs/error.js Normal file
View File

@ -0,0 +1,13 @@
import ready from '../mastodon/ready';
ready(() => {
const image = document.querySelector('img');
image.addEventListener('mouseenter', () => {
image.src = '/oops.gif';
});
image.addEventListener('mouseleave', () => {
image.src = '/oops.png';
});
});

14
app/javascript/styles/mastodon/basics.scss
View File

@ -100,12 +100,14 @@ body {
vertical-align: middle; vertical-align: middle;
margin: 20px; margin: 20px;
img { &__illustration {
display: block; img {
max-width: 470px; display: block;
width: 100%; max-width: 470px;
height: auto; width: 100%;
margin-top: -120px; height: auto;
margin-top: -120px;
}
} }
h1 { h1 {

7
app/views/layouts/error.html.haml
View File

@ -7,8 +7,11 @@
%meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/ %meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/
= stylesheet_pack_tag 'common', media: 'all' = stylesheet_pack_tag 'common', media: 'all'
= stylesheet_pack_tag Setting.default_settings['theme'], media: 'all' = stylesheet_pack_tag Setting.default_settings['theme'], media: 'all'
= javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
= javascript_pack_tag 'error', integrity: true, crossorigin: 'anonymous'
%body.error %body.error
.dialog .dialog
%img{ alt: Setting.default_settings['site_title'], src: '/oops.gif' }/ .dialog__illustration
%div %img{ alt: Setting.default_settings['site_title'], src: '/oops.png' }/
.dialog__message
%h1= yield :content %h1= yield :content

BIN
public/oops.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB