krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing issue with hair bangs, styles and colors not getting the option.active class (#9759)

Browse Source
This commit is contained in:
Irina Brennen
2018-01-29 14:57:35 -06:00
committed by Sabe Jones
parent 563a5845f0
commit 6bd90807f3
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
website/client/components/creatorIntro.vue
View File

@@ -159,7 +159,7 @@ b-modal#avatar-modal(title="", :size='editing ? "lg" : "md"', :hide-header='true
.col-12.customize-options .col-12.customize-options
.head_0.option(@click='set({"preferences.hair.bangs": 0})', .head_0.option(@click='set({"preferences.hair.bangs": 0})',
:class="[{ active: user.preferences.hair.bangs === 0 }, 'hair_bangs_0_' + user.preferences.hair.color]") :class="[{ active: user.preferences.hair.bangs === 0 }, 'hair_bangs_0_' + user.preferences.hair.color]")
.option(v-for='option in ["1", "2", "3", "4"]', .option(v-for='option in [1, 2, 3, 4]',
:class='{active: user.preferences.hair.bangs === option}') :class='{active: user.preferences.hair.bangs === option}')
.bangs.sprite.customize-option(:class="`hair_bangs_${option}_${user.preferences.hair.color}`", @click='set({"preferences.hair.bangs": option})') .bangs.sprite.customize-option(:class="`hair_bangs_${option}_${user.preferences.hair.color}`", @click='set({"preferences.hair.bangs": option})')
#facialhair.row(v-if='activeSubPage === "facialhair"') #facialhair.row(v-if='activeSubPage === "facialhair"')
@@ -227,7 +227,7 @@ b-modal#avatar-modal(title="", :size='editing ? "lg" : "md"', :hide-header='true
#flowers.row(v-if='activeSubPage === "flower"') #flowers.row(v-if='activeSubPage === "flower"')
.col-12.customize-options .col-12.customize-options
.head_0.option(@click='set({"preferences.hair.flower":0})', :class='{active: user.preferences.hair.flower === 0}') .head_0.option(@click='set({"preferences.hair.flower":0})', :class='{active: user.preferences.hair.flower === 0}')
.option(v-for='option in ["1", "2", "3", "4", "5", "6"]', .option(v-for='option in [1, 2, 3, 4, 5, 6]',
:class='{active: user.preferences.hair.flower === option}') :class='{active: user.preferences.hair.flower === option}')
.sprite.customize-option(:class="`hair_flower_${option}`", @click='set({"preferences.hair.flower": option})') .sprite.customize-option(:class="`hair_flower_${option}`", @click='set({"preferences.hair.flower": option})')
.row(v-if='activeSubPage === "flower"') .row(v-if='activeSubPage === "flower"')
@@ -975,12 +975,12 @@ export default {
rainbowSkinKeys: ['eb052b', 'f69922', 'f5d70f', '0ff591', '2b43f6', 'd7a9f7', '800ed0', 'rainbow'], rainbowSkinKeys: ['eb052b', 'f69922', 'f5d70f', '0ff591', '2b43f6', 'd7a9f7', '800ed0', 'rainbow'],
animalSkinKeys: ['bear', 'cactus', 'fox', 'lion', 'panda', 'pig', 'tiger', 'wolf'], animalSkinKeys: ['bear', 'cactus', 'fox', 'lion', 'panda', 'pig', 'tiger', 'wolf'],
premiumHairColorKeys: ['rainbow', 'yellow', 'green', 'purple', 'blue', 'TRUred'], premiumHairColorKeys: ['rainbow', 'yellow', 'green', 'purple', 'blue', 'TRUred'],
baseHair1: ['1', '3'], baseHair1: [1, 3],
baseHair2Keys: ['2', '4', '5', '6', '7', '8'], baseHair2Keys: [2, 4, 5, 6, 7, 8],
baseHair3Keys: ['9', '10', '11', '12', '13', '14'], baseHair3Keys: [9, 10, 11, 12, 13, 14],
baseHair4Keys: ['15', '16', '17', '18', '19', '20'], baseHair4Keys: [15, 16, 17, 18, 19, 20],
baseHair5Keys: ['1', '2', '3'], baseHair5Keys: [1, 2, 3],
baseHair6Keys: ['1', '2'], baseHair6Keys: [1, 2],
animalEarsKeys: ['bearEars', 'cactusEars', 'foxEars', 'lionEars', 'pandaEars', 'pigEars', 'tigerEars', 'wolfEars'], animalEarsKeys: ['bearEars', 'cactusEars', 'foxEars', 'lionEars', 'pandaEars', 'pigEars', 'tigerEars', 'wolfEars'],
icons: Object.freeze({ icons: Object.freeze({
logoPurple, logoPurple,