krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-15 21:57:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Redesign: Misc fixes (#8984)

Browse Source 
* fix(checklists): parse Markdown

* fix(Guilds): Markdown in descriptions
This commit is contained in:
Sabe Jones
2017-08-23 14:36:43 -05:00
committed by GitHub
parent 034f18c419
commit ad621e7208
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,7 +125,7 @@
.toggle-down(@click="sections.description = !sections.description", v-if="!sections.description") .toggle-down(@click="sections.description = !sections.description", v-if="!sections.description")
.svg-icon(v-html="icons.downIcon") .svg-icon(v-html="icons.downIcon")
.section(v-if="sections.description") .section(v-if="sections.description")
p {{ group.description }} p(v-markdown='group.description')
.section-header.challenge .section-header.challenge
.row .row
@@ -380,6 +380,7 @@ import inviteModal from './inviteModal';
import chatMessage from '../chat/chatMessages'; import chatMessage from '../chat/chatMessages';
import autocomplete from '../chat/autoComplete'; import autocomplete from '../chat/autoComplete';
import groupChallenges from '../challenges/groupChallenges'; import groupChallenges from '../challenges/groupChallenges';
import markdownDirective from 'client/directives/markdown';
import bCollapse from 'bootstrap-vue/lib/components/collapse'; import bCollapse from 'bootstrap-vue/lib/components/collapse';
import bCard from 'bootstrap-vue/lib/components/card'; import bCard from 'bootstrap-vue/lib/components/card';
@@ -418,6 +419,7 @@ export default {
}, },
directives: { directives: {
bToggle, bToggle,
markdown: markdownDirective,
}, },
data () { data () {
return { return {

2
website/client/components/tasks/task.vue
View File

@@ -21,7 +21,7 @@
) )
input.custom-control-input(type="checkbox", :checked="item.completed", @change="toggleChecklistItem(item)") input.custom-control-input(type="checkbox", :checked="item.completed", @change="toggleChecklistItem(item)")
span.custom-control-indicator span.custom-control-indicator
span.custom-control-description {{ item.text }} span.custom-control-description(v-markdown='item.text')
.icons.small-text.d-flex.align-items-center .icons.small-text.d-flex.align-items-center
.d-flex.align-items-center(v-if="task.type === 'todo' && task.date", :class="{'due-overdue': isDueOverdue}") .d-flex.align-items-center(v-if="task.type === 'todo' && task.date", :class="{'due-overdue': isDueOverdue}")
.svg-icon.calendar(v-html="icons.calendar") .svg-icon.calendar(v-html="icons.calendar")