diff --git a/website/client/components/appMenu.vue b/website/client/components/appMenu.vue index 3ebac07fed..e0807ef2f0 100644 --- a/website/client/components/appMenu.vue +++ b/website/client/components/appMenu.vue @@ -3,9 +3,10 @@ div inbox-modal creator-intro profile - nav.navbar.navbar-inverse.fixed-top.navbar-toggleable-lg + nav.navbar.navbar-inverse.fixed-top.navbar-toggleable-md .navbar-header - .logo.svg-icon(v-html="icons.logo") + .logo.svg-icon.hidden-lg-down(v-html="icons.logo") + .svg-icon.gryphon.hidden-xl-up b-collapse#nav_collapse.collapse.navbar-collapse(is-nav) ul.navbar-nav.mr-auto router-link.nav-item(tag="li", :to="{name: 'tasks'}", exact) @@ -93,58 +94,34 @@ div @import '~client/assets/scss/colors.scss'; @import '~client/assets/scss/utils.scss'; - /* Less than Desktops and laptops ----------- */ - @media only screen and (max-width : 1224px) { - #nav_collapse { - background: $purple-100; - margin-top: 1em; - margin-left: 70%; - padding-bottom: 1em; - - a { - padding: .5em !important; - } - } - - .dropdown-menu { - position: absolute !important; - left: -10em; - top: -.5em; - } - } - - @media only screen and (max-width : 1224px) and (min-width: 1200px) { - #nav_collapse { - margin-top: 37em !important; - - a { - width: 100%; - } - } - - .navbar-collapse.collapse { - display: none !important; - } - - .navbar-collapse.collapse.show { - display: block !important; - } - - .navbar-toggler, .navbar-nav { - display: block; - } - - .navbar-toggleable-lg .navbar-collapse { - display: block; - } - } - @media only screen and (max-width: 1280px) { .nav-link { padding: .8em 1em !important; } } + @media only screen and (max-width: 1200px) { + .navbar-header { + margin-right: 0px; + } + + .gryphon { + background-image: url('~assets/images/melior@3x.png'); + width: 30px; + height: 30px; + background-size: cover; + color: $white; + margin: 0 auto; + } + } + + @media only screen and (max-width: 990px) { + #nav_collapse { + margin-top: 1.3em; + background-color: $purple-200; + } + } + nav.navbar { background: $purple-100 url(~assets/svg/for-css/bits.svg) right no-repeat; padding-left: 25px; diff --git a/website/client/components/notifications.vue b/website/client/components/notifications.vue index 027d3f9654..e35d9cc988 100644 --- a/website/client/components/notifications.vue +++ b/website/client/components/notifications.vue @@ -158,6 +158,7 @@ export default { return { yesterDailies: [], + levelBeforeYesterdailies: 0, notificationData: {}, unlockLevels, lastShownNotifications, @@ -256,12 +257,8 @@ export default { this.mp(mana); }, userLvl (after, before) { - if (after <= before) return; - this.lvl(); - this.playSound('Level_Up'); - if (this.user._tmp && this.user._tmp.drop && this.user._tmp.drop.type === 'Quest') return; - if (this.unlockLevels[`${after}`]) return; - if (!this.user.preferences.suppressModals.levelUp) this.$root.$emit('show::modal', 'level-up'); + if (after <= before || this.isRunningYesterdailies) return; + this.showLevelUpNotifications(after); }, userClassSelect (after) { if (!after) return; @@ -334,6 +331,13 @@ export default { }); }, methods: { + showLevelUpNotifications (newlevel) { + this.lvl(); + this.playSound('Level_Up'); + if (this.user._tmp && this.user._tmp.drop && this.user._tmp.drop.type === 'Quest') return; + if (this.unlockLevels[`${newlevel}`]) return; + if (!this.user.preferences.suppressModals.levelUp) this.$root.$emit('show::modal', 'level-up'); + }, playSound (sound) { this.$root.$emit('playSound', sound); }, @@ -390,6 +394,7 @@ export default { return; } + this.levelBeforeYesterdailies = this.user.stats.lvl; this.$root.$emit('show::modal', 'yesterdaily'); }, async runYesterDailiesAction () { @@ -405,6 +410,10 @@ export default { this.$store.dispatch('tasks:fetchUserTasks', {forceLoad: true}), ]); + if (this.levelBeforeYesterdailies < this.user.stats.lvl) { + this.showLevelUpNotifications(this.user.stats.lvl); + } + this.handleUserNotifications(this.user.notifications); this.scheduleNextCron(); }, diff --git a/website/client/components/shops/buyModal.vue b/website/client/components/shops/buyModal.vue index 7a1d069d52..accc01d0bf 100644 --- a/website/client/components/shops/buyModal.vue +++ b/website/client/components/shops/buyModal.vue @@ -209,6 +209,7 @@