krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 22:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' into develop

Browse Source
This commit is contained in:
SabreCat
2017-12-01 21:32:28 +00:00
parent 7e23fdc22a 44f3b73183
commit cb58994bdf
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/client/components/avatar.vue
View File

@@ -24,7 +24,7 @@
span.head_0 span.head_0
span(:class="getGearClass('back_collar')") span(:class="getGearClass('back_collar')")
span(:class="getGearClass('body')") 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="'hair_' + type + '_' + member.preferences.hair[type] + '_' + member.preferences.hair.color")
span(:class="getGearClass('eyewear')") span(:class="getGearClass('eyewear')")
span(:class="getGearClass('head')") span(:class="getGearClass('head')")

2
website/client/components/notifications.vue
View File

@@ -311,6 +311,8 @@ export default {
}, },
methods: { methods: {
checkUserAchievements () { 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 // 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) { if (!this.user.flags.welcomed) {
this.$store.state.avatarEditorOptions.editingUser = false; this.$store.state.avatarEditorOptions.editingUser = false;