From 1ec4caa0bbea18854a8a7bccaa7e2a0ea8bdf79e Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sat, 6 Jul 2019 23:52:10 +0300 Subject: [PATCH] fix merge conflict --- src/components/conversation/conversation.vue | 2 +- .../post_status_form/post_status_form.vue | 163 +++++++++++++++--- 2 files changed, 142 insertions(+), 23 deletions(-) diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index f5642c73..5a900607 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -26,8 +26,8 @@ :in-conversation="isExpanded" :highlight="getHighlight()" :replies="getReplies(status.id)" - @goto="setHighlight" class="status-fadein panel-body" + @goto="setHighlight" @toggleExpanded="toggleExpanded" /> diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue index 8ffacd75..379c9f3b 100644 --- a/src/components/post_status_form/post_status_form.vue +++ b/src/components/post_status_form/post_status_form.vue @@ -58,30 +58,150 @@ {{ $t('post_status.direct_warning_to_first_only') }} {{ $t('post_status.direct_warning_to_all') }}

- -
- + + - + v-model="newStatus.spoilerText" + type="text" + :placeholder="$t('post_status.content_warning')" + class="form-post-subject" + > + + +