diff --git a/src/client/app/desktop/views/components/notifications.vue b/src/client/app/desktop/views/components/notifications.vue index b838a5a55..ab4c627ce 100644 --- a/src/client/app/desktop/views/components/notifications.vue +++ b/src/client/app/desktop/views/components/notifications.vue @@ -20,7 +20,7 @@ {{ notification.user | userName }}

- + {{ getNoteSummary(notification.note) }} @@ -32,7 +32,7 @@

{{ notification.note.user | userName }}

- + {{ getNoteSummary(notification.note.renote) }} @@ -44,7 +44,7 @@

{{ notification.note.user | userName }}

- {{ getNoteSummary(notification.note) }} + {{ getNoteSummary(notification.note) }} @@ -72,7 +72,7 @@

{{ notification.note.user | userName }}

- {{ getNoteSummary(notification.note) }} + {{ getNoteSummary(notification.note) }} @@ -82,7 +82,7 @@

{{ notification.note.user | userName }}

- {{ getNoteSummary(notification.note) }} + {{ getNoteSummary(notification.note) }} @@ -90,7 +90,7 @@

{{ notification.user | userName }}

- + {{ getNoteSummary(notification.note) }}
@@ -219,7 +219,7 @@ export default Vue.extend({ margin 0 padding 16px overflow-wrap break-word - font-size 13px + font-size 12px border-bottom solid 1px var(--faceDivider) &:last-child @@ -262,9 +262,17 @@ export default Vue.extend({ .note-preview color var(--noteText) + display inline-block + overflow hidden + max-height 48px .note-ref color var(--noteText) + display inline-block + width: 100% + overflow hidden + white-space nowrap + text-overflow ellipsis [data-icon] font-size 1em diff --git a/src/client/app/desktop/views/pages/deck/deck.notification.vue b/src/client/app/desktop/views/pages/deck/deck.notification.vue index 9418007f2..fce9853b6 100644 --- a/src/client/app/desktop/views/pages/deck/deck.notification.vue +++ b/src/client/app/desktop/views/pages/deck/deck.notification.vue @@ -8,7 +8,7 @@ {{ notification.user | userName }} - + {{ getNoteSummary(notification.note) }} @@ -23,7 +23,7 @@ {{ notification.user | userName }} - + {{ getNoteSummary(notification.note.renote) }} @@ -59,7 +59,7 @@ {{ notification.user | userName }} - + {{ getNoteSummary(notification.note) }} @@ -112,7 +112,7 @@ export default Vue.extend({ .dsfykdcjpuwfvpefwufddclpjhzktmpw > .notification padding 16px - font-size 13px + font-size 12px overflow-wrap break-word &:after @@ -150,6 +150,11 @@ export default Vue.extend({ > .note-ref color var(--noteText) + display inline-block + width: 100% + overflow hidden + white-space nowrap + text-overflow ellipsis [data-icon] font-size 1em diff --git a/src/client/app/mobile/views/components/notification.vue b/src/client/app/mobile/views/components/notification.vue index c99b291ff..1228047c9 100644 --- a/src/client/app/mobile/views/components/notification.vue +++ b/src/client/app/mobile/views/components/notification.vue @@ -8,7 +8,7 @@ {{ notification.user | userName }} - + {{ getNoteSummary(notification.note) }} @@ -23,7 +23,7 @@ {{ notification.user | userName }} - + {{ getNoteSummary(notification.note.renote) }} @@ -59,7 +59,7 @@ {{ notification.user | userName }} - + {{ getNoteSummary(notification.note) }} @@ -162,6 +162,11 @@ export default Vue.extend({ > .note-ref color var(--noteText) + display inline-block + width: 100% + overflow hidden + white-space nowrap + text-overflow ellipsis [data-icon] font-size 1em diff --git a/src/misc/get-note-summary.ts b/src/misc/get-note-summary.ts index 3f9648303..aa7687c52 100644 --- a/src/misc/get-note-summary.ts +++ b/src/misc/get-note-summary.ts @@ -29,18 +29,18 @@ const summarize = (note: any): string => { // 返信のとき if (note.replyId) { if (note.reply) { - summary += ` RE: ${summarize(note.reply)}`; + summary += `\n\nRE: ${summarize(note.reply)}`; } else { - summary += ' RE: ...'; + summary += '\n\nRE: ...'; } } // Renoteのとき if (note.renoteId) { if (note.renote) { - summary += ` RN: ${summarize(note.renote)}`; + summary += `\n\nRN: ${summarize(note.renote)}`; } else { - summary += ' RN: ...'; + summary += '\n\nRN: ...'; } }