Revert "Change error graphic to hover-to-play (mastodon#10055)"

*temp* This reverts commit 80388a3.
akane-blue · Feb 18, 2019 · c8554e6 · c8554e6
1 parent d47aca2
commit c8554e6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 26 deletions.
diff --git a/app/javascript/packs/error.js b/app/javascript/packs/error.js
diff --git a/app/javascript/styles/mastodon/basics.scss b/app/javascript/styles/mastodon/basics.scss
@@ -100,14 +100,12 @@ body {
       vertical-align: middle;
       margin: 20px;
 
-      &__illustration {
-        img {
-          display: block;
-          max-width: 470px;
-          width: 100%;
-          height: auto;
-          margin-top: -120px;
-        }
+      img {
+        display: block;
+        max-width: 470px;
+        width: 100%;
+        height: auto;
+        margin-top: -120px;
       }
 
       h1 {

diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml
@@ -7,11 +7,8 @@
     %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
-      .dialog__illustration
-        %img{ alt: Setting.default_settings['site_title'], src: '/oops.png' }/
-      .dialog__message
+      %img{ alt: Setting.default_settings['site_title'], src: '/oops.gif' }/
+      %div
         %h1= yield :content
diff --git a/public/oops.png b/public/oops.png