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

fix(shops): various cleanup

Browse Source
This commit is contained in:
Sabe Jones
2024-06-04 11:50:26 -05:00
parent f33aff577c
commit fd5bc8f0b9
6 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
website/client/src/components/avatarModal/customize-options.vue
View File

@@ -1,6 +1,7 @@
<template> <template>
<div <div
class="customize-options mb-4" class="customize-options mb-4"
v-if="items.length > 1"
> >
<div <div
v-for="option in items" v-for="option in items"

4
website/client/src/components/avatarModal/extra-settings.vue
View File

@@ -21,7 +21,7 @@
id="animal-ears" id="animal-ears"
> >
<customize-options <customize-options
v-if="animalItems('back').length > 1" v-if="animalItems('back').length > 0"
:items="animalItems('headAccessory')" :items="animalItems('headAccessory')"
/> />
</div> </div>
@@ -30,7 +30,7 @@
id="animal-tails" id="animal-tails"
> >
<customize-options <customize-options
v-if="animalItems('back').length > 1" v-if="animalItems('back').length > 0"
:items="animalItems('back')" :items="animalItems('back')"
/> />
</div> </div>

2
website/client/src/components/shops/customizations/index.vue
View File

@@ -98,7 +98,7 @@
} }
.featured-label { .featured-label {
margin-left: 52px; margin-left: 90px;
margin-top: 200px; margin-top: 200px;
} }

15
website/client/src/components/shops/timeTravelers/index.vue
View File

@@ -68,7 +68,15 @@
</div> </div>
</div> </div>
</div> </div>
</div><div </div>
<div class="d-flex justify-content-between w-items mt-1">
<h1
v-once
class="mb-4 page-header"
>
{{ $t('timeTravelers') }}
</h1>
<div
class="clearfix" class="clearfix"
> >
<div class="float-right"> <div class="float-right">
@@ -83,6 +91,7 @@
/> />
</div> </div>
</div> </div>
</div>
<!-- eslint-disable vue/no-use-v-if-with-v-for --> <!-- eslint-disable vue/no-use-v-if-with-v-for -->
<div <div
v-for="category in categories" v-for="category in categories"
@@ -141,6 +150,10 @@
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~@/assets/scss/colors.scss'; @import '~@/assets/scss/colors.scss';
@import '~@/assets/scss/shops.scss'; @import '~@/assets/scss/shops.scss';
.w-items {
max-width: 920px;
}
</style> </style>
<script> <script>

1
website/client/src/components/tasks/modal-controls/selectDifficulty.vue
View File

@@ -7,6 +7,7 @@
:disabled="disabled" :disabled="disabled"
:value="selected" :value="selected"
:hide-icon="true" :hide-icon="true"
:direct-select="true"
@select="$emit('select', $event.value)" @select="$emit('select', $event.value)"
> >
<template #item="{ item, button }"> <template #item="{ item, button }">

2
website/client/src/store/actions/user.js
View File

@@ -48,7 +48,7 @@ export async function set (store, changes) {
tagsIndexesToRemove.forEach(i => task.tags.splice(i, 1)); tagsIndexesToRemove.forEach(i => task.tags.splice(i, 1));
}); });
}); });
} else if ((key.startsWith('preferences.hair') || key.startsWith('preferences.chair')) } else if (((key.startsWith('preferences.hair') && !(key.startsWith('preferences.hair.color'))) || key.startsWith('preferences.chair'))
&& getProps(user, key) === changes[key]) { && getProps(user, key) === changes[key]) {
setProps(user, key, key.startsWith('preferences.chair') ? 'none' : 0); setProps(user, key, key.startsWith('preferences.chair') ? 'none' : 0);
} else { } else {