From 57d80932a4f36a9b56dd3b6c3c06bd40f2704e64 Mon Sep 17 00:00:00 2001 From: Aya Morisawa Date: Fri, 16 Nov 2018 23:13:37 +0900 Subject: [PATCH] Add an optional setting to remain deleted note (#3271) Co-authored-by: Aya Morisawa Co-authored-by: syuilo --- locales/ja-JP.yml | 1 + src/client/app/desktop/views/components/note.vue | 13 ++++++++++--- .../app/desktop/views/components/settings.vue | 6 ++++++ src/client/app/mobile/views/components/note.vue | 9 +++++++-- src/client/app/store.ts | 1 + 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 390bfc9f31..2dfa1cea76 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -850,6 +850,7 @@ desktop/views/components/settings.vue: show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する" show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する" show-maps: "マップの自動展開" + remain-deleted-note: "削除された投稿を表示し続ける" deck-column-align: "デッキのカラムの位置" deck-column-align-center: "中央" deck-column-align-left: "左" diff --git a/src/client/app/desktop/views/components/note.vue b/src/client/app/desktop/views/components/note.vue index 86534adc49..71d7ae4203 100644 --- a/src/client/app/desktop/views/components/note.vue +++ b/src/client/app/desktop/views/components/note.vue @@ -2,7 +2,7 @@
-
+

{{ appearNote.cw }} @@ -53,7 +53,7 @@

-
+
via {{ appearNote.app.name }}
+
{{ $t('deleted') }}
@@ -89,6 +90,7 @@ import noteSubscriber from '../../../common/scripts/note-subscriber'; export default Vue.extend({ i18n: i18n('desktop/views/components/note.vue'), + components: { XSub }, @@ -343,6 +345,7 @@ export default Vue.extend({ margin-left 0.5em color var(--noteHeaderInfo) font-size 0.8em + > button margin 0 28px 0 0 padding 0 8px @@ -376,6 +379,10 @@ export default Vue.extend({ &.reacted, &.reacted:hover color var(--noteActionsReactionHover) + > .deleted + color var(--noteText) + opacity 0.7 +