Merge branch 'develop' of https://github.com/syuilo/misskey into develop

This commit is contained in:
syuilo 2019-07-05 22:32:19 +09:00
commit 48353cccae

View file

@ -1,5 +1,5 @@
<template> <template>
<mfm-core v-bind="$attrs" class="havbbuyv" v-once/> <mfm-core v-bind="$attrs" class="havbbuyv" :class="{ plain: $attrs['plain-text'] }" v-once/>
</template> </template>
<script lang="ts"> <script lang="ts">
@ -17,6 +17,9 @@ export default Vue.extend({
.havbbuyv .havbbuyv
white-space pre-wrap white-space pre-wrap
&.plain
white-space pre
>>> .title >>> .title
display block display block
margin-bottom 4px margin-bottom 4px