From cf5985e38c9cc20edf013c0ee28cfd9d15e223a1 Mon Sep 17 00:00:00 2001
From: negue <negue@users.noreply.github.com>
Date: Tue, 10 Oct 2017 05:40:39 +0200
Subject: [PATCH] oct 9 fixes (#9175)

* hide hatching modal before opening the hatched modal

* fix Options not sticking: Costume, Auto Equip

* Hall of Heroes - Collapse Items & Auth

* prevent wrapping currency icon+text

* fix spacing of remaining gems (if two digits)

* fix logo in safari (removed <mask />)

* update seasonal shop items on purchase
---
 website/client/assets/svg/logo.svg            |  3 --
 website/client/components/appMenu.vue         |  1 +
 website/client/components/hall/heroes.vue     | 39 ++++++++++++-------
 .../components/inventory/stable/index.vue     |  2 +-
 .../client/components/shops/market/index.vue  |  3 +-
 .../components/shops/seasonal/index.vue       |  9 +++++
 website/client/components/ui/toggleSwitch.vue |  2 +-
 7 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/website/client/assets/svg/logo.svg b/website/client/assets/svg/logo.svg
index f1881f640a..1c2501ab6d 100755
--- a/website/client/assets/svg/logo.svg
+++ b/website/client/assets/svg/logo.svg
@@ -4,9 +4,6 @@
     </defs>
     <g fill="none" fill-rule="evenodd">
         <path fill="#FFF" d="M24.052 26.3c-.832-.09-.841-.462-.832-5.421 0 0-.083-.312.395-.582.477-.27 1.93-2.679 1.037-4.734-.892-2.056-.248-1.952.125-1.744.374.208.554-.055.332-1.183-.457-2.325-1.17-3.113-2.851-4.162-1.104-.69-.704-1.94.866-1.848.766.045.766.046.862-.555.152-.947-.15-2.565-1.327-2.788-.81-.154-1.817.713-3.015.109-1.198-.604-3.178.904-3.988 1.254s-1.479.354-2.403.331c-.925-.022.49 1.531 1.906 1.881 1.216.3.743.516.674 1.51-.078 1.113.24 1.59-.279 1.707-.796.178-1.686-1.961-3.052-2.857C9.4 5.183 7.56 6.152 2.15.201 1.211-.83 1.592 2.36 2.17 4.063c1.543 4.55 4.532 5.153 5.942 5.29 1.18.116 1.984-.158 1.984.297 0 .33-1.391.48-1.93.482a9.469 9.469 0 0 1-1.762-.173c-1.073-.2.569 2.535 1.624 3.402 1.78 1.465 3.818 2.014 5.456 2.18.473.048 1.146.04 1.146.41 0 .352-.354.438-.773.441-2.294.017-3.612 1.849-3.986 3.967-.237 1.346-.06 2.868-.035 4.005l.09.812c.18 1.426-4.948 1.975-5.627-.322-.743-2.51 3.309-3.837 3.383-6.232.047-1.509-1.333-2.194-1.333-2.194V14.224H4.76v-1.587H3.174V11.05H1.587v4.761h1.587V17.4h2.613c.594 0 1.07.392 1.015 1.24-.137 2.093-4.589 3.379-3.365 6.716.884 2.41 4.696 2.441 8.513 2.441l7.118-.006c.222 0 .534-.107.08-1.255-.367-.927-1.632-.276-2.706-.276-1.137 0-1.176-.96-.446-1.973.446-.618 1.014-1.078 1.979-1.527 1.486-.693 2.617.198 3.174.963.8 1.099 1.054 2.355.348 2.552-.851.238-1.113.27-1.141 1.08-.022.581.256.422 1.595.422h4.445c.688 0 .637-.53-.055-1.45-.491-.653-1.028.11-2.289-.027z"/>
-        <mask id="b" fill="#fff">
-            <use xlink:href="#a"/>
-        </mask>
         <path fill="#FFF" d="M0 10.827h1.587V9.24H0zM113.986 19.894a1.385 1.385 0 0 0-1.942.25c-.54.7-1.354 1.101-2.236 1.101a2.82 2.82 0 0 1-2.815-2.645 416.05 416.05 0 0 1-.005-1.947 2.824 2.824 0 0 1 2.82-2.821c.781 0 1.508.312 2.046.879a1.385 1.385 0 0 0 2.008-1.907 5.614 5.614 0 0 0-4.054-1.741 5.596 5.596 0 0 0-5.59 5.59c0 .019.001 1.937.009 2.078a5.589 5.589 0 0 0 5.581 5.283c1.747 0 3.361-.793 4.429-2.178a1.385 1.385 0 0 0-.251-1.942M122.223 21.245a2.819 2.819 0 0 1-2.815-2.644 419.52 419.52 0 0 1-.006-1.949 2.824 2.824 0 0 1 2.82-2.82 2.824 2.824 0 0 1 2.821 2.82c0 .2-.002 1.734-.005 1.946a2.818 2.818 0 0 1-2.815 2.647m4.205-10.422c-.645 0-1.183.444-1.336 1.04a5.55 5.55 0 0 0-2.87-.8 5.596 5.596 0 0 0-5.589 5.59c0 .019.001 1.936.008 2.078a5.589 5.589 0 0 0 8.517 4.447 1.384 1.384 0 0 0 2.655-.548V12.208c0-.765-.62-1.385-1.385-1.385M58.861 21.245a2.819 2.819 0 0 1-2.815-2.646c-.003-.213-.005-1.747-.005-1.947a2.824 2.824 0 0 1 2.82-2.82 2.824 2.824 0 0 1 2.82 2.82c0 .2-.001 1.734-.005 1.946a2.818 2.818 0 0 1-2.815 2.647m4.206-10.422c-.646 0-1.183.444-1.337 1.04a5.55 5.55 0 0 0-2.869-.8 5.596 5.596 0 0 0-5.59 5.59c0 .019.001 1.937.009 2.078a5.589 5.589 0 0 0 8.516 4.447 1.384 1.384 0 0 0 2.655-.548V12.208c0-.765-.62-1.385-1.384-1.385M83.451 10.823c-.764 0-1.384.62-1.384 1.385V22.63a1.385 1.385 0 0 0 2.769 0V12.208c0-.765-.62-1.385-1.385-1.385M99.759 10.823c-.765 0-1.385.62-1.385 1.385V22.63a1.385 1.385 0 0 0 2.77 0V12.208c0-.765-.62-1.385-1.385-1.385M76.266 18.6a2.82 2.82 0 0 1-2.815 2.645 2.82 2.82 0 0 1-2.815-2.647c-.004-.214-.005-1.746-.005-1.946a2.824 2.824 0 0 1 2.82-2.82 2.824 2.824 0 0 1 2.82 2.82c0 .193-.002 1.733-.005 1.949m-2.815-7.538c-1.03 0-1.991.284-2.82.772v-5.17a1.385 1.385 0 0 0-2.77 0V22.63a1.385 1.385 0 0 0 2.655.548c.856.529 1.86.836 2.935.836a5.59 5.59 0 0 0 5.582-5.288c.007-.137.008-2.054.008-2.074a5.596 5.596 0 0 0-5.59-5.59M45.664 11.063a5.58 5.58 0 0 0-2.674.677V6.665a1.385 1.385 0 0 0-2.77 0V22.63a1.385 1.385 0 1 0 2.77 0v-7.157c.106-.09.203-.191.281-.315a2.808 2.808 0 0 1 2.393-1.326 2.824 2.824 0 0 1 2.82 2.82c0 .254-.002 5.635-.006 5.944a1.385 1.385 0 0 0 2.767.104c.007-.137.008-5.989.008-6.048a5.596 5.596 0 0 0-5.59-5.59M94.503 10.823h-1.616V6.665a1.385 1.385 0 0 0-2.77 0v4.158h-1.614a1.385 1.385 0 0 0 0 2.77h1.615v9.037a1.385 1.385 0 0 0 2.77 0v-9.038h1.615a1.385 1.385 0 0 0 0-2.769" mask="url(#b)"/>
         <path fill="#FF6066" d="M84.785 6.665a1.385 1.385 0 1 1-2.77 0 1.385 1.385 0 0 1 2.77 0" mask="url(#b)"/>
         <path fill="#4FB5E8" d="M101.092 6.665a1.385 1.385 0 1 1-2.77 0 1.385 1.385 0 0 1 2.77 0" mask="url(#b)"/>
diff --git a/website/client/components/appMenu.vue b/website/client/components/appMenu.vue
index 0230a44a83..b4dd4ba284 100644
--- a/website/client/components/appMenu.vue
+++ b/website/client/components/appMenu.vue
@@ -234,6 +234,7 @@ div
     font-weight: normal;
     padding-top: 16px;
     padding-left: 16px;
+    white-space: nowrap;
 
     .svg-icon {
       vertical-align: bottom;
diff --git a/website/client/components/hall/heroes.vue b/website/client/components/hall/heroes.vue
index d0054c1d74..c910c66148 100644
--- a/website/client/components/hall/heroes.vue
+++ b/website/client/components/hall/heroes.vue
@@ -38,8 +38,8 @@
             small {{ '`user.balance`' + this.$t('notGems') }}
           .accordion
             .accordion-group(heading='Items')
-              h4 Update Item
-              .form-group.well
+              h4.expand-toggle(:class="{'open': expandItems}", @click="expandItems = !expandItems") Update Item
+              .form-group.well(v-if="expandItems")
                 input.form-control(type='text',placeholder='Path (eg, items.pets.BearCub-Base)',v-model='hero.itemPath')
                 small.muted Enter the <strong>item path</strong>. E.g., <code>items.pets.BearCub-Zombie</code> or <code>items.gear.owned.head_special_0</code> or <code>items.gear.equipped.head</code>. You can find all the item paths below.
                 br
@@ -51,18 +51,19 @@
                   .accordion-group(heading='Current Items')
                     pre {{hero.items}}
             .accordion-group(heading='Auth')
-              h4 Auth
-              pre {{hero.auth}}
-              .form-group
-                .checkbox
-                  label
-                    input(type='checkbox', v-if='hero.flags', v-model='hero.flags.chatRevoked')
-                    | Chat Privileges Revoked
-              .form-group
-                .checkbox
-                  label
-                    input(type='checkbox', v-model='hero.auth.blocked')
-                    | Blocked
+              h4.expand-toggle(:class="{'open': expandAuth}", @click="expandAuth = !expandAuth") Auth
+              div(v-if="expandAuth")
+                pre {{hero.auth}}
+                .form-group
+                  .checkbox
+                    label
+                      input(type='checkbox', v-if='hero.flags', v-model='hero.flags.chatRevoked')
+                      | Chat Privileges Revoked
+                .form-group
+                  .checkbox
+                    label
+                      input(type='checkbox', v-model='hero.auth.blocked')
+                      | Blocked
 
           // h4 Backer Status
           // Add backer stuff like tier, disable adds, etcs
@@ -95,6 +96,12 @@
               div(v-markdown='hero.contributor.contributions', target='_blank')
 </template>
 
+<style lang="scss" scoped>
+  h4.expand-toggle::after {
+    margin-left: 5px;
+  }
+</style>
+
 <script>
 // import keys from 'lodash/keys';
 import each from 'lodash/each';
@@ -123,6 +130,8 @@ export default {
       hatchingPotions,
       special,
       gear,
+      expandItems: false,
+      expandAuth: false,
     };
   },
   directives: {
@@ -171,6 +180,8 @@ export default {
           chatRevoked: false,
         };
       }
+      this.expandItems = false;
+      this.expandAuth = false;
     },
     async saveHero () {
       this.hero.contributor.admin = this.hero.contributor.level > 7 ? true : false;
diff --git a/website/client/components/inventory/stable/index.vue b/website/client/components/inventory/stable/index.vue
index 3f220968b7..01516f484b 100644
--- a/website/client/components/inventory/stable/index.vue
+++ b/website/client/components/inventory/stable/index.vue
@@ -909,8 +909,8 @@
       hatchPet (pet) {
         this.$store.dispatch('common:hatch', {egg: pet.eggKey, hatchingPotion: pet.potionKey});
 
-        this.$root.$emit('hatchedPet::open', pet);
         this.closeHatchPetDialog();
+        this.$root.$emit('hatchedPet::open', pet);
       },
 
       onDragStart (ev, food) {
diff --git a/website/client/components/shops/market/index.vue b/website/client/components/shops/market/index.vue
index 2972f92431..c29afd7904 100644
--- a/website/client/components/shops/market/index.vue
+++ b/website/client/components/shops/market/index.vue
@@ -350,7 +350,8 @@
     top: -.5em;
     color: $white;
     background: $purple-200;
-    padding: .15em .55em;
+    padding: .15em;
+    text-align: center;
     width: 24px;
     height: 24px;
     border-radius: 50%;
diff --git a/website/client/components/shops/seasonal/index.vue b/website/client/components/shops/seasonal/index.vue
index 62f9644aa3..d4fb49bfc7 100644
--- a/website/client/components/shops/seasonal/index.vue
+++ b/website/client/components/shops/seasonal/index.vue
@@ -353,6 +353,8 @@
 
         hidePinned: false,
         featuredGearBought: false,
+
+        backgroundUpdate: new Date(),
       };
     },
     computed: {
@@ -367,6 +369,8 @@
       },
 
       seasonal () {
+        let backgroundUpdate = this.backgroundUpdate; // eslint-disable-line
+
         let seasonal = shops.getSeasonalShop(this.user);
 
         let itemsNotOwned = seasonal.featured.items.filter(item => {
@@ -498,5 +502,10 @@
         this.$root.$emit('buyModal::showItem', item);
       },
     },
+    created () {
+      this.$root.$on('buyModal::boughtItem', () => {
+        this.backgroundUpdate = new Date();
+      });
+    },
   };
 </script>
diff --git a/website/client/components/ui/toggleSwitch.vue b/website/client/components/ui/toggleSwitch.vue
index 779f296aa3..1ea40c04e7 100644
--- a/website/client/components/ui/toggleSwitch.vue
+++ b/website/client/components/ui/toggleSwitch.vue
@@ -130,7 +130,7 @@ export default {
   },
   methods: {
     handleChange ({ target: { checked } }) {
-      this.$emit('change', checked ? this.value : this.uncheckedValue);
+      this.$emit('change', checked);
     },
   },
 };