Merge branch 'release' into develop

This commit is contained in:
Sabe Jones
2018-03-08 21:43:35 +00:00
36 changed files with 339 additions and 324 deletions
+1 -1
View File
@@ -90,7 +90,7 @@
.toggle-up(v-if="sections.worldBoss")
.svg-icon.boss-icon.reverse(v-html="icons.chevronIcon")
.mt-3(v-if="sections.worldBoss", v-html="questData.notes()")
.text-center.mt-4
// .text-center.mt-4
.world-boss-info-button(@click="showWorldBossInfo()") {{$t('whatIsWorldBoss') }}
.sleep.below-header-sections
@@ -3,7 +3,8 @@ base-notification(
:can-remove="false",
:notification="{}",
:read-after-click="false",
@click="action"
@click="action",
v-if="worldBoss.active"
)
.background(slot="content")
.text
@@ -495,8 +495,8 @@ export default {
categories.push({
identifier: 'cards',
text: this.$t('cards'),
items: _map(_filter(this.content.cardTypes, (value, key) => {
return value.yearRound || key === 'valentine';
items: _map(_filter(this.content.cardTypes, (value) => {
return value.yearRound;
}), (value) => {
return {
...getItemInfo(this.user, 'card', value),