Browse Source

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

Fix #6060
pull/4/head
Eugen Rochko 5 years ago
committed by GitHub
parent
commit
80388a3ffe
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 8 deletions
  1. +13
    -0
      app/javascript/packs/error.js
  2. +8
    -6
      app/javascript/styles/mastodon/basics.scss
  3. +5
    -2
      app/views/layouts/error.html.haml
  4. BIN
     

+ 13
- 0
app/javascript/packs/error.js 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';
});
});

+ 8
- 6
app/javascript/styles/mastodon/basics.scss View File

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

+ 5
- 2
app/views/layouts/error.html.haml View File

@ -7,8 +7,11 @@
%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'
= javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
= javascript_pack_tag 'error', integrity: true, crossorigin: 'anonymous'
%body.error
.dialog
%img{ alt: Setting.default_settings['site_title'], src: '/oops.gif' }/
%div
.dialog__illustration
%img{ alt: Setting.default_settings['site_title'], src: '/oops.png' }/
.dialog__message
%h1= yield :content

BIN
View File


Loading…
Cancel
Save