Fixed pending damage display and nav size (#9723)

This commit is contained in:
Keith Holliday
2017-12-18 12:31:16 -06:00
committed by GitHub
parent 9830fce760
commit b8c716ff82
3 changed files with 9 additions and 9 deletions

View File

@@ -388,10 +388,6 @@ export default {
}, },
computed: { computed: {
...mapState({user: 'user.data'}), ...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 () { communityGuidelinesAccepted () {
return this.user.flags.communityGuidelinesAccepted; return this.user.flags.communityGuidelinesAccepted;
}, },

View File

@@ -208,6 +208,10 @@ export default {
}, },
computed: { computed: {
...mapState({user: 'user.data'}), ...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 () { onPendingQuest () {
return Boolean(this.group.quest.key) && !this.group.quest.active; return Boolean(this.group.quest.key) && !this.group.quest.active;
}, },

View File

@@ -75,17 +75,17 @@ div
@import '~client/assets/scss/colors.scss'; @import '~client/assets/scss/colors.scss';
@import '~client/assets/scss/utils.scss'; @import '~client/assets/scss/utils.scss';
@media only screen and (max-width: 1280px) { @media only screen and (max-width: 1305px) {
.nav-link { .nav-link {
padding: .8em 1em !important; padding: .8em 1em !important;
} }
.navbar-header {
margin-right: 5px !important;
}
} }
@media only screen and (max-width: 1200px) { @media only screen and (max-width: 1200px) {
.navbar-header {
margin-right: 24px !important;
}
.gryphon { .gryphon {
background-image: url('~assets/images/melior@3x.png'); background-image: url('~assets/images/melior@3x.png');
width: 30px; width: 30px;