diff options
| -rw-r--r-- | src/components/conversation/conversation.js | 6 | ||||
| -rw-r--r-- | src/components/conversation/conversation.vue | 6 | ||||
| -rw-r--r-- | src/components/status/status.js | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js index a598b521..769893d3 100644 --- a/src/components/conversation/conversation.js +++ b/src/components/conversation/conversation.js @@ -49,7 +49,11 @@ const conversation = { } }, focused: function (id) { - return (id === this.statusoid.id) + if (!!this.statusoid.retweeted_status) { + return (id === this.statusoid.retweeted_status.id) + } else { + return (id === this.statusoid.id) + } } } } diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 5f395f46..33a43e15 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -1,10 +1,10 @@ <template> <div class="timeline panel panel-default base00-background"> - <div class="panel-heading base01-background base04" style="justify-content:space-between;"> + <div class="panel-heading base01-background base04"> Conversation - <div v-if="collapsable"> + <span v-if="collapsable" style="float:right;"> <small><a href="#" @click.prevent="$emit('toggleExpanded')">Collapse</a></small> - </div> + </span> </div> <div class="panel-body"> <div class="timeline"> diff --git a/src/components/status/status.js b/src/components/status/status.js index 101a0e14..bc9d6e6c 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -32,7 +32,7 @@ const Status = { return !!this.$store.state.users.currentUser }, muted () { return !this.unmuted && this.status.user.muted }, - isReply () { return !!this.statusoid.in_reply_to_status_id } + isReply () { return !!this.status.in_reply_to_status_id } }, components: { Attachment, |