mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-18 07:07:35 +01:00
Beard and mustache facial hairs now can be bought as a full set for 5 gems (#10338)
* Purchasing All Facial Hairs Fixed * Notifications z-index fixed * Notifications z-index fixed x2 * Z-indexes fixed, facial hairs buying corrected * isPurchaseAllNeeded refactored * isPurchaseAllNeeded is more generic now * Linting Passed
This commit is contained in:
committed by
Matteo Pagliazzi
parent
128ec5a1b1
commit
6c64a1cd8c
@@ -1,6 +1,6 @@
|
||||
<template lang="pug">
|
||||
.notifications
|
||||
div(v-for='notification in notifications', :key='notification.uuid')
|
||||
.notifications(:class="notificationsTopPos")
|
||||
div(v-for='notification in notificationStore', :key='notification.uuid')
|
||||
notification(:notification='notification')
|
||||
</template>
|
||||
|
||||
@@ -8,13 +8,23 @@
|
||||
.notifications {
|
||||
position: fixed;
|
||||
right: 10px;
|
||||
top: 65px;
|
||||
width: 350px;
|
||||
z-index: 1041; // 1041 is above modal backgrounds
|
||||
z-index: 1070; // 1070 is above modal backgrounds
|
||||
|
||||
&-top-pos {
|
||||
&-normal {
|
||||
top: 65px;
|
||||
}
|
||||
|
||||
&-sleeping {
|
||||
top: 105px;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
<script>
|
||||
import { mapState } from 'client/libs/store';
|
||||
import notification from './notification';
|
||||
|
||||
export default {
|
||||
@@ -22,8 +32,19 @@ export default {
|
||||
notification,
|
||||
},
|
||||
computed: {
|
||||
notifications () {
|
||||
return this.$store.state.notificationStore;
|
||||
...mapState({
|
||||
notificationStore: 'notificationStore',
|
||||
userSleeping: 'user.data.preferences.sleep',
|
||||
}),
|
||||
notificationsTopPos () {
|
||||
const base = 'notifications-top-pos-';
|
||||
let modifier = '';
|
||||
if (this.userSleeping) {
|
||||
modifier = 'sleeping';
|
||||
} else {
|
||||
modifier = 'normal';
|
||||
}
|
||||
return `${base}${modifier}`;
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user