diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2019-07-05 22:32:19 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-07-05 22:32:19 +0900 |
| commit | 48353cccae6369747b4eb3519fc999fd8e55efee (patch) | |
| tree | 20aa1bc0f30c5ebf4f881ca944011d7d2dde6b37 /src | |
| parent | Fix #4760 (diff) | |
| parent | Fix: SingleLineなMFMが折り返されてしまう (#5109) (diff) | |
| download | sharkey-48353cccae6369747b4eb3519fc999fd8e55efee.tar.gz sharkey-48353cccae6369747b4eb3519fc999fd8e55efee.tar.bz2 sharkey-48353cccae6369747b4eb3519fc999fd8e55efee.zip | |
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/app/common/views/components/misskey-flavored-markdown.vue | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/client/app/common/views/components/misskey-flavored-markdown.vue b/src/client/app/common/views/components/misskey-flavored-markdown.vue index fa24f6dfa4..a0ecbecbb2 100644 --- a/src/client/app/common/views/components/misskey-flavored-markdown.vue +++ b/src/client/app/common/views/components/misskey-flavored-markdown.vue @@ -1,5 +1,5 @@ <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> <script lang="ts"> @@ -17,6 +17,9 @@ export default Vue.extend({ .havbbuyv white-space pre-wrap + &.plain + white-space pre + >>> .title display block margin-bottom 4px |