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

Merge branch 'develop' into release

Browse Source
This commit is contained in:
Sabe Jones
2020-11-13 14:31:50 -06:00
parent 6ed1353e31 d3ba0346af
commit 1c089c33a0
141 changed files with 1522 additions and 828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
website/client/src/app.vue
View File

@@ -38,7 +38,7 @@
<template v-else>
<template v-if="isUserLoaded">
<damage-paused-banner />
<gems-promo-banner />
<!-- <gems-promo-banner /> -->
<notifications-display />
<app-menu />
<div
@@ -153,7 +153,7 @@ import { loadProgressBar } from 'axios-progress-bar';
import AppMenu from './components/header/menu';
import AppHeader from './components/header/index';
import DamagePausedBanner from './components/header/banners/damagePaused';
import GemsPromoBanner from './components/header/banners/gemsPromo';
// import GemsPromoBanner from './components/header/banners/gemsPromo';
import AppFooter from './components/appFooter';
import notificationsDisplay from './components/notifications';
import snackbars from './components/snackbars/notifications';
@@ -184,7 +184,7 @@ export default {
AppHeader,
AppFooter,
DamagePausedBanner,
GemsPromoBanner,
// GemsPromoBanner,
notificationsDisplay,
snackbars,
BuyModal,