From e138d2b67ba04b8bd1cb73aefdb445ab0b3afc1e Mon Sep 17 00:00:00 2001 From: Keith Holliday Date: Fri, 1 Dec 2017 09:54:43 -0600 Subject: [PATCH 1/2] Added needs cron check to achievements (#9624) --- website/client/components/notifications.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/client/components/notifications.vue b/website/client/components/notifications.vue index 164c5c13cd..f14bedac88 100644 --- a/website/client/components/notifications.vue +++ b/website/client/components/notifications.vue @@ -311,6 +311,8 @@ export default { }, methods: { checkUserAchievements () { + if (this.user.needsCron) return; + // List of prompts for user on changes. Sounds like we may need a refactor here, but it is clean for now if (!this.user.flags.welcomed) { this.$store.state.avatarEditorOptions.editingUser = false; From 44f3b73183861603287e246bcade7aeadeb4e51f Mon Sep 17 00:00:00 2001 From: SabreCat Date: Fri, 1 Dec 2017 21:10:33 +0000 Subject: [PATCH 2/2] fix(avatar): layer base/bangs correctly --- website/client/components/avatar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/client/components/avatar.vue b/website/client/components/avatar.vue index b76fd8a4c7..8e6f711f26 100644 --- a/website/client/components/avatar.vue +++ b/website/client/components/avatar.vue @@ -24,7 +24,7 @@ span.head_0 span(:class="getGearClass('back_collar')") span(:class="getGearClass('body')") - template(v-for="type in ['base', 'bangs', 'mustache', 'beard']") + template(v-for="type in ['bangs', 'base', 'mustache', 'beard']") span(:class="'hair_' + type + '_' + member.preferences.hair[type] + '_' + member.preferences.hair.color") span(:class="getGearClass('eyewear')") span(:class="getGearClass('head')")