From 1819398f41fbfc510a8baee330779bdd1c853393 Mon Sep 17 00:00:00 2001
From: SabreCat <sabrecat@gmail.com>
Date: Tue, 3 Apr 2018 17:19:14 +0000
Subject: [PATCH] Revert "feat(event): April Foolery 2018"

This reverts commit f7b9ca124d43a75713ccd6ff5242aade3761362f.
---
 website/client/assets/css/sprites.css   | 29 +------------------------
 website/client/assets/scss/animals.scss |  2 +-
 website/client/components/avatar.vue    | 12 +++++-----
 3 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/website/client/assets/css/sprites.css b/website/client/assets/css/sprites.css
index 3b50e94b11..906e3bc5a2 100755
--- a/website/client/assets/css/sprites.css
+++ b/website/client/assets/css/sprites.css
@@ -100,34 +100,7 @@
 
 [class*="Mount_Head_"],
 [class*="Mount_Body_"] {
-  margin-top: 18px; /* Sprite accommodates 105x123 box */
-  left: 28px;
-  top: 34px;
-}
-
-[class*="Mount_"],
-[class*="Pet-"] {
-  transform: scale(0.333, 0.333);
-  -ms-transform: scale(0.333, 0.333);
-  -webkit-transform: scale(0.333, 0.333);
-}
-
-[class*="_Sabretooth"],
-[class*="_TRex"],
-[class*="_Wolf"] {
-  left: 18px;
-  top: 25px;
-}
-
-[class*="_JackOLantern"] {
-  left: 32px;
-}
-
-[class*="_Cuttlefish"],
-[class*="_Frog"],
-[class*="_MagicalBee"],
-[class*="_Mammoth"] {
-  top: 30px;
+  margin-top:18px; /* Sprite accommodates 105x123 box */
 }
 
 .Pet_Currency_Gem {
diff --git a/website/client/assets/scss/animals.scss b/website/client/assets/scss/animals.scss
index ca2bb92043..a75f6dcb17 100644
--- a/website/client/assets/scss/animals.scss
+++ b/website/client/assets/scss/animals.scss
@@ -7,7 +7,7 @@
   left: 0;
 
   &:not([class*="FlyingPig"]) {
-    top: -8px !important;
+    top: -28px !important;
   }
 }
 
diff --git a/website/client/components/avatar.vue b/website/client/components/avatar.vue
index e62965e78a..a4acea6cc0 100644
--- a/website/client/components/avatar.vue
+++ b/website/client/components/avatar.vue
@@ -1,6 +1,10 @@
 <template lang="pug">
 .avatar(:style="{width, height, paddingTop}", :class="backgroundClass", @click.prevent='castEnd()')
   .character-sprites(:style='{margin: spritesMargin}')
+    template(v-if="!avatarOnly")
+      // Mount Body
+      span(v-if="member.items.currentMount", :class="'Mount_Body_' + member.items.currentMount")
+
     // Buffs that cause visual changes to avatar: Snowman, Ghost, Flower, etc
     template(v-for="(klass, item) in visualBuffs")
       span(v-if="member.stats.buffs[item] && showVisualBuffs", :class="klass")
@@ -32,8 +36,6 @@
     span.zzz(v-if="member.preferences.sleep")
 
     template(v-if="!avatarOnly")
-      // Mount Body
-      span(v-if="member.items.currentMount", :class="'Mount_Body_' + member.items.currentMount")
       // Mount Head
       span(v-if="member.items.currentMount", :class="'Mount_Head_' + member.items.currentMount")
       // Pet
@@ -62,8 +64,8 @@
   }
 
   .current-pet {
-    right: 70px;
-    top: 70px;
+    bottom: 0px;
+    left: 0px;
   }
 </style>
 
@@ -134,7 +136,7 @@ export default {
 
       if (!this.avatarOnly) {
         if (this.member.items.currentPet) val = '24.5px';
-        // if (this.member.items.currentMount) val = '0px';
+        if (this.member.items.currentMount) val = '0px';
       }
 
       return val;