From dc39caed1e735e4ce580d6acfc31cf3a56ce28d5 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 16 Feb 2020 22:15:49 +0900 Subject: [PATCH] Resolve #5942 --- CHANGELOG.md | 1 + src/client/components/notes.vue | 27 +++++++++----- src/client/pages/note.vue | 62 ++++++++++++++++++++++++++++++--- src/client/scripts/paging.ts | 30 ++++++++-------- src/client/style.scss | 7 ++++ 5 files changed, 100 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24c5a77e6..720754462 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ChangeLog unreleased ------------------- ### ✨Improvements +* 投稿詳細ページで前後の投稿を見れるように * 自分のfollowersノートはRenoteできるように * フォロー申請ページの調整 * 壁紙設定の強化 diff --git a/src/client/components/notes.vue b/src/client/components/notes.vue index be8f68e3a..487dff16a 100644 --- a/src/client/components/notes.vue +++ b/src/client/components/notes.vue @@ -7,16 +7,23 @@ - - - - -
+
-
+ + + + + + +
+ + + + +
@@ -67,6 +74,10 @@ export default Vue.extend({ notes(): any[] { return this.extract ? this.extract(this.items) : this.items; }, + + reversed(): boolean { + return this.pagination.reversed; + } }, methods: { @@ -92,14 +103,14 @@ export default Vue.extend({ } > .notes { - > ::v-deep * { + > ::v-deep *:not(:last-child) { margin-bottom: var(--marginFull); } } &.max-width_500px { > .notes { - > ::v-deep * { + > ::v-deep *:not(:last-child) { margin-bottom: var(--marginHalf); } } diff --git a/src/client/pages/note.vue b/src/client/pages/note.vue index 3e4e21d34..73a0bb37b 100644 --- a/src/client/pages/note.vue +++ b/src/client/pages/note.vue @@ -4,9 +4,19 @@ {{ $t('noteOf', { user: note.user.name }) }} - -
- +
+ + +
+ + +
+ +
+ + +
+
@@ -14,9 +24,12 @@