diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-24 23:00:56 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-24 23:00:56 +0000 |
| commit | fe906cc3f0c8388bcb2a33be9c72ca5365bde0a5 (patch) | |
| tree | a92128b2779b3971d15699b4410c37687446d480 /src/components/status/status.vue | |
| parent | 13acdc4a00f7c4e8487de0c95fe69ff110f13e6e (diff) | |
| parent | 55650ff7ea9867cdb8adf7077b36bbb8c7bfcb75 (diff) | |
Merge branch 'develop' into 'notifications'
# Conflicts:
# src/main.js
Diffstat (limited to 'src/components/status/status.vue')
| -rw-r--r-- | src/components/status/status.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/status/status.vue b/src/components/status/status.vue index e7d5ed7a..2bc44ee7 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -1,5 +1,5 @@ <template> - <div class="status-el" :class="[{ 'status-el_focused': isFocused }, { 'status-conversation': inlineExpanded }]"> + <div class="status-el" v-if="!hideReply" :class="[{ 'status-el_focused': isFocused }, { 'status-conversation': inlineExpanded }]"> <template v-if="muted && !noReplyLinks"> <div class="media status container muted"> <small><router-link :to="{ name: 'user-profile', params: { id: status.user.id } }">{{status.user.screen_name}}</router-link></small> |