From 042e5a8d633472273385ff232694fe8ab782c06e Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Fri, 16 Jun 2017 18:07:24 +0200
Subject: [PATCH] Client Fixes (#8821)

* new client: fix animation flickering

* fix transitions

* update copy
---
 website/client/assets/scss/icon.scss                    | 6 +++++-
 website/client/assets/scss/index.scss                   | 2 +-
 website/client/components/appMenu.vue                   | 1 +
 website/client/components/inventory/equipment/index.vue | 2 +-
 website/client/components/inventory/items/index.vue     | 2 +-
 website/client/components/memberDetails.vue             | 6 ++----
 website/common/locales/en/newClient.json                | 4 ++--
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/website/client/assets/scss/icon.scss b/website/client/assets/scss/icon.scss
index 6039d4fae9..0686d9e2e5 100644
--- a/website/client/assets/scss/icon.scss
+++ b/website/client/assets/scss/icon.scss
@@ -5,5 +5,9 @@
   stroke-width: 0;
   stroke: currentColor;
   fill: currentColor;
-  transition: none;
+  transition: none !important;
+}
+
+.svg-icon * {
+  transition: none !important;
 }
\ No newline at end of file
diff --git a/website/client/assets/scss/index.scss b/website/client/assets/scss/index.scss
index 8f4e979447..b01742f67b 100644
--- a/website/client/assets/scss/index.scss
+++ b/website/client/assets/scss/index.scss
@@ -2,7 +2,7 @@
 @import './utils';
 @import './colors';
 
-*:not(.svg-icon *) {
+* {
   transition-duration: .15s;
   transition-property: border-color, box-shadow, color;
   transition-timing-function: ease-in;
diff --git a/website/client/components/appMenu.vue b/website/client/components/appMenu.vue
index cd4d431f6a..872953d826 100644
--- a/website/client/components/appMenu.vue
+++ b/website/client/components/appMenu.vue
@@ -158,6 +158,7 @@ nav.navbar {
   padding-right: 12.5px;
   padding-left: 12.5px;
   color: $header-color;
+  transition: none;
 
   &:hover {
     color: $white;
diff --git a/website/client/components/inventory/equipment/index.vue b/website/client/components/inventory/equipment/index.vue
index 04d8d0dbd0..dc060216a5 100644
--- a/website/client/components/inventory/equipment/index.vue
+++ b/website/client/components/inventory/equipment/index.vue
@@ -112,7 +112,7 @@
       a.btn.btn-show-more(
         v-if="items[group.key].length > itemsPerLine",
         @click="viewOptions[group.key].open = !viewOptions[group.key].open"
-      ) {{ viewOptions[group.key].open ? $t('showLessGearItems', { type: group.label }) : $t('showAllGearItems', { type: group.label, items: items[group.key].length }) }}
+      ) {{ viewOptions[group.key].open ? $t('showLessItems', { type: group.label }) : $t('showAllItems', { type: group.label, items: items[group.key].length }) }}
 </template>
 
 <style lang="scss" scoped>
diff --git a/website/client/components/inventory/items/index.vue b/website/client/components/inventory/items/index.vue
index 9066eb0cbe..d39063b22a 100644
--- a/website/client/components/inventory/items/index.vue
+++ b/website/client/components/inventory/items/index.vue
@@ -53,7 +53,7 @@
       a.btn.btn-show-more(
         v-if="items[group.key].length > itemsPerLine",
         @click="group.open = !group.open"
-      ) {{ group.open ? $t('showLessGearItems', { type: $t(group.key) }) : $t('showAllGearItems', { type: $t(group.key), items: items[group.key].length }) }}
+      ) {{ group.open ? $t('showLessItems', { type: $t(group.key) }) : $t('showAllItems', { type: $t(group.key), items: items[group.key].length }) }}
 
 </template>
 
diff --git a/website/client/components/memberDetails.vue b/website/client/components/memberDetails.vue
index 4327b54dc2..54ba5f6cbb 100644
--- a/website/client/components/memberDetails.vue
+++ b/website/client/components/memberDetails.vue
@@ -41,16 +41,14 @@
 .member-stats {
   padding-left: 16px;
   padding-right: 24px;
-  height: auto;
   opacity: 1;
   transition: opacity 0.15s ease-out;
 }
 
 .member-details.condensed:not(.expanded) .member-stats {
   opacity: 0;
-  height: 0;
-  padding: 0;
-  width: 0;
+  position: absolute;
+  z-index: -1;
 }
 
 // Condensed version
diff --git a/website/common/locales/en/newClient.json b/website/common/locales/en/newClient.json
index 8ea63085a6..6db683c726 100644
--- a/website/common/locales/en/newClient.json
+++ b/website/common/locales/en/newClient.json
@@ -30,8 +30,8 @@
   "memberCount": "Member Count",
   "recentActivity": "Recent Activity",
   "gearNotOwned": "You do not own this item.",
-  "showAllGearItems": "Show All <%= items %> <%= type %> Gear Items",
-  "showLessGearItems": "Show Less <%= type %> Gear Items",
+  "showAllItems": "Show All <%= items %> <%= type %> Items",
+  "showLessItems": "Show Less <%= type %> Items",
   "noGearItemsOfType": "You don't own any pieces of <%= type %>.",
   "myGuilds": "My Guilds",
   "guildsDiscovery": "Discover Guilds",