Content and fixes 2017-10-05 (#9165)

* fix(market): display classless equipment

* fix(challenges): more missing Markdown

* feat(content): backgrounds and Enchanted Armoire 2017-10

* chore(sprites): compile
This commit is contained in:
Sabe Jones
2017-10-05 19:00:39 -05:00
committed by GitHub
parent f1ec8bbf2c
commit 3503b307b2
112 changed files with 32507 additions and 32236 deletions

View File

@@ -11,8 +11,8 @@ div
.row
.col-9
router-link.title(:to="{ name: 'challenge', params: { challengeId: challenge._id } }")
strong {{challenge.name}}
p {{challenge.summary || challenge.name}}
strong(v-markdown='challenge.name')
p(v-markdown='challenge.summary || challenge.name')
div
.svg-icon.member-icon(v-html="icons.memberIcon")
.member-count {{challenge.memberCount}}
@@ -82,10 +82,11 @@ div
<script>
import challengeModal from './challengeModal';
import { mapState } from 'client/libs/store';
import markdownDirective from 'client/directives/markdown';
import challengeIcon from 'assets/svg/challenge.svg';
import gemIcon from 'assets/svg/gem.svg';
import memberIcon from 'assets/svg/member-icon.svg';
import challengeIcon from 'assets/svg/challenge.svg';
export default {
props: ['groupId'],
@@ -106,6 +107,9 @@ export default {
groupIdForChallenges: '',
};
},
directives: {
markdown: markdownDirective,
},
mounted () {
this.loadChallenges();
},