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

Fixed pending damage display and nav size (#9723)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
website/client/components/groups/group.vue
View File

@@ -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;
},

4
website/client/components/groups/questSidebarSection.vue
View File

@@ -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;
},

10
website/client/components/header/menu.vue
View File

@@ -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;