mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-16 06:07:21 +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
@@ -3,7 +3,7 @@ div
|
||||
inbox-modal
|
||||
creator-intro
|
||||
profile
|
||||
b-navbar.navbar.navbar-inverse.fixed-top.navbar-expand-lg(type="dark")
|
||||
b-navbar.navbar.navbar-inverse.fixed-top.navbar-expand-lg(type="dark", :class="navbarZIndexClass")
|
||||
.navbar-header
|
||||
.logo.svg-icon.d-none.d-xl-block(v-html="icons.logo")
|
||||
.svg-icon.gryphon.d-md-block.d-none.d-xl-none
|
||||
@@ -145,7 +145,16 @@ div
|
||||
padding-right: 12.5px;
|
||||
height: 56px;
|
||||
box-shadow: 0 1px 2px 0 rgba($black, 0.24);
|
||||
z-index: 1042; // To stay above snakbar notifications and modals
|
||||
}
|
||||
|
||||
.navbar-z-index {
|
||||
&-normal {
|
||||
z-index: 1080;
|
||||
}
|
||||
|
||||
&-modal {
|
||||
z-index: 1035;
|
||||
}
|
||||
}
|
||||
|
||||
.navbar-header {
|
||||
@@ -327,7 +336,14 @@ export default {
|
||||
user: 'user.data',
|
||||
userHourglasses: 'user.data.purchased.plan.consecutive.trinkets',
|
||||
groupPlans: 'groupPlans',
|
||||
modalStack: 'modalStack',
|
||||
}),
|
||||
navbarZIndexClass () {
|
||||
if (this.modalStack.length > 0) {
|
||||
return 'navbar-z-index-modal';
|
||||
}
|
||||
return 'navbar-z-index-normal';
|
||||
},
|
||||
},
|
||||
mounted () {
|
||||
this.getUserGroupPlans();
|
||||
|
||||
Reference in New Issue
Block a user