From b8c716ff82738e96094ee9dcdb4da9534af98593 Mon Sep 17 00:00:00 2001 From: Keith Holliday Date: Mon, 18 Dec 2017 12:31:16 -0600 Subject: [PATCH] Fixed pending damage display and nav size (#9723) --- website/client/components/groups/group.vue | 4 ---- .../client/components/groups/questSidebarSection.vue | 4 ++++ website/client/components/header/menu.vue | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/website/client/components/groups/group.vue b/website/client/components/groups/group.vue index 95164e8eef..9854858da7 100644 --- a/website/client/components/groups/group.vue +++ b/website/client/components/groups/group.vue @@ -388,10 +388,6 @@ export default { }, computed: { ...mapState({user: 'user.data'}), - userIsOnQuest () { - if (!this.group.quest || !this.group.quest.members) return false; - return Boolean(this.group.quest.members[this.user._id]); - }, communityGuidelinesAccepted () { return this.user.flags.communityGuidelinesAccepted; }, diff --git a/website/client/components/groups/questSidebarSection.vue b/website/client/components/groups/questSidebarSection.vue index 0594f73ae4..b8e90a73b6 100644 --- a/website/client/components/groups/questSidebarSection.vue +++ b/website/client/components/groups/questSidebarSection.vue @@ -208,6 +208,10 @@ export default { }, computed: { ...mapState({user: 'user.data'}), + userIsOnQuest () { + if (!this.group.quest || !this.group.quest.members) return false; + return Boolean(this.group.quest.members[this.user._id]); + }, onPendingQuest () { return Boolean(this.group.quest.key) && !this.group.quest.active; }, diff --git a/website/client/components/header/menu.vue b/website/client/components/header/menu.vue index 0b45cf3afd..1fdca4a76a 100644 --- a/website/client/components/header/menu.vue +++ b/website/client/components/header/menu.vue @@ -75,17 +75,17 @@ div @import '~client/assets/scss/colors.scss'; @import '~client/assets/scss/utils.scss'; - @media only screen and (max-width: 1280px) { + @media only screen and (max-width: 1305px) { .nav-link { padding: .8em 1em !important; } + + .navbar-header { + margin-right: 5px !important; + } } @media only screen and (max-width: 1200px) { - .navbar-header { - margin-right: 24px !important; - } - .gryphon { background-image: url('~assets/images/melior@3x.png'); width: 30px;