From 71150f21cd91df7bdd78a8f708db092418e85baa Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 4 Jun 2022 15:23:53 +0900 Subject: [PATCH] Revert "feat: option to collapse long notes (#8561)" This reverts commit e675ffcf38b07f5c70d00b49c171c7ab3460e810. --- locales/ja-JP.yml | 1 - packages/client/src/components/note.vue | 27 +++---------------------- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 57be9bfcbb..9cd1d1eedb 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -52,7 +52,6 @@ searchUser: "ユーザーを検索" reply: "返信" loadMore: "もっと見る" showMore: "もっと見る" -showLess: "閉じる" youGotNewFollower: "フォローされました" receiveFollowRequest: "フォローリクエストされました" followRequestAccepted: "フォローが承認されました" diff --git a/packages/client/src/components/note.vue b/packages/client/src/components/note.vue index 4840b0dc2a..bc8a0dd19d 100644 --- a/packages/client/src/components/note.vue +++ b/packages/client/src/components/note.vue @@ -46,7 +46,7 @@

-
+
({{ i18n.ts.private }}) @@ -66,12 +66,9 @@
- -
{{ appearNote.channel.name }}
@@ -169,8 +166,7 @@ const reactButton = ref(); let appearNote = $computed(() => isRenote ? note.renote as misskey.entities.Note : note); const isMyRenote = $i && ($i.id === note.userId); const showContent = ref(false); -const collapsed = ref(appearNote.cw == null); -const isLong = ref(appearNote.cw == null && appearNote.text != null && ( +const collapsed = ref(appearNote.cw == null && appearNote.text != null && ( (appearNote.text.split('\n').length > 9) || (appearNote.text.length > 500) )); @@ -456,23 +452,6 @@ function readPromo() { } > .content { - &.isLong { - > .showLess { - width: 100%; - margin-top: 1em; - position: sticky; - bottom: 1em; - - > span { - display: inline-block; - background: var(--panel); - padding: 6px 10px; - font-size: 0.8em; - border-radius: 999px; - box-shadow: 0 0 7px 7px var(--bg); - } - } - } &.collapsed { position: relative; max-height: 9em;