diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js index 68b90c72..53cfd0ce 100644 --- a/src/components/conversation/conversation.js +++ b/src/components/conversation/conversation.js @@ -82,6 +82,9 @@ const conversation = { streamingEnabled () { return this.mergedConfig.useStreamingApi && this.mastoUserSocketStatus === WSConnectionStatus.JOINED }, + timelineStyle () { + return this.$store.getters.mergedConfig.timelineStyle + }, displayStyle () { return this.$store.getters.mergedConfig.conversationDisplay }, diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 61f1358a..e6cd3235 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -69,6 +69,7 @@ :in-profile="inProfile" :profile-user-id="profileUserId" class="conversation-status status-fadein panel-body" + :class="timelineStyle" :simple-tree="treeViewIsSimple" :toggle-thread-display="toggleThreadDisplay" @@ -173,6 +174,7 @@ :in-profile="inProfile" :profile-user-id="profileUserId" class="conversation-status status-fadein panel-body" + :class="timelineStyle" :toggle-thread-display="toggleThreadDisplay" :thread-display-status="threadDisplayStatus" @@ -243,7 +245,7 @@ padding: var(--status-margin, $status-margin); } - .conversation-status { + .conversation-status.classic { border-bottom-width: 1px; border-bottom-style: solid; border-bottom-color: var(--border, $fallback--border); diff --git a/src/components/emoji_reactions/emoji_reactions.js b/src/components/emoji_reactions/emoji_reactions.js index 94aa3734..42b74fb2 100644 --- a/src/components/emoji_reactions/emoji_reactions.js +++ b/src/components/emoji_reactions/emoji_reactions.js @@ -39,6 +39,9 @@ const EmojiReactions = { return acc }, {}) }, + timelineStyle () { + return this.$store.getters.mergedConfig.timelineStyle + }, loggedIn () { return !!this.$store.state.users.currentUser }, diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue index c083625f..b54bbd32 100644 --- a/src/components/emoji_reactions/emoji_reactions.vue +++ b/src/components/emoji_reactions/emoji_reactions.vue @@ -1,5 +1,5 @@