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

Fix banner offset on initial load

Browse Source
This commit is contained in:
Phillip Thelen
2018-09-26 18:10:24 +02:00
parent 8cc6a96be0
commit d9719cdc05
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
website/client/app.vue
View File

@@ -246,16 +246,6 @@ export default {
return !this.bannerHidden && this.user.preferences.sleep; return !this.bannerHidden && this.user.preferences.sleep;
}, },
}, },
watch: {
showRestingBanner () {
this.$nextTick(() => {
console.log(this.$refs);
console.log(this.$refs.restingBanner);
console.log(this.showRestingBanner);
this.setBannerOffset();
});
},
},
created () { created () {
this.$root.$on('playSound', (sound) => { this.$root.$on('playSound', (sound) => {
let theme = this.user.preferences.sound; let theme = this.user.preferences.sound;
@@ -439,6 +429,14 @@ export default {
this.hideLoadingScreen(); this.hideLoadingScreen();
window.addEventListener('resize', this.setBannerOffset);
// Adjust the positioning of the header banners
this.$watch('showRestingBanner', () => {
this.$nextTick(() => {
this.setBannerOffset();
});
}, {immediate: true});
// Adjust the timezone offset // Adjust the timezone offset
if (this.user.preferences.timezoneOffset !== this.browserTimezoneOffset) { if (this.user.preferences.timezoneOffset !== this.browserTimezoneOffset) {
this.$store.dispatch('user:set', { this.$store.dispatch('user:set', {
@@ -471,8 +469,6 @@ export default {
// Remove the index.html loading screen and now show the inapp loading // Remove the index.html loading screen and now show the inapp loading
const loadingScreen = document.getElementById('loading-screen'); const loadingScreen = document.getElementById('loading-screen');
if (loadingScreen) document.body.removeChild(loadingScreen); if (loadingScreen) document.body.removeChild(loadingScreen);
window.addEventListener('resize', this.setBannerOffset);
this.setBannerOffset();
}, },
methods: { methods: {
checkForBannedUser (error) { checkForBannedUser (error) {
@@ -636,7 +632,6 @@ export default {
if (this.showRestingBanner && this.$refs.restingBanner !== undefined) { if (this.showRestingBanner && this.$refs.restingBanner !== undefined) {
contentPlacement = this.$refs.restingBanner.clientHeight; contentPlacement = this.$refs.restingBanner.clientHeight;
} }
console.log(this.showRestingBanner, contentPlacement);
this.bannerHeight = contentPlacement; this.bannerHeight = contentPlacement;
let smartBanner = document.getElementsByClassName('smartbanner')[0]; let smartBanner = document.getElementsByClassName('smartbanner')[0];
if (smartBanner !== undefined) { if (smartBanner !== undefined) {