diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-03-28 20:08:40 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-03-28 20:08:40 +0000 |
| commit | 7e8c2acc981b6d4f55e0fd898f1769a82658d49a (patch) | |
| tree | 074323e3ec8c8cea427780f6c7a095dc032e0d6f /src/components/status/status.vue | |
| parent | e2e3a65c44c1bd73d3d727333e6163e9b0d07653 (diff) | |
| parent | a39fc49e848c1444f76a7528eac4a7733199b336 (diff) | |
Merge branch 'issue-433-status-reply-form' into 'develop'
Issue 433 status reply form
Closes #433
See merge request pleroma/pleroma-fe!674
Diffstat (limited to 'src/components/status/status.vue')
| -rw-r--r-- | src/components/status/status.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 1f6d0325..da329deb 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -12,7 +12,7 @@ </div> </template> <template v-else> - <div v-if="retweet && !noHeading" :class="[repeaterClass, { highlighted: repeaterStyle }]" :style="[repeaterStyle]" class="media container retweet-info"> + <div v-if="retweet && !noHeading && !inConversation" :class="[repeaterClass, { highlighted: repeaterStyle }]" :style="[repeaterStyle]" class="media container retweet-info"> <UserAvatar class="media-left" v-if="retweet" :betterShadow="betterShadow" :src="statusoid.user.profile_image_url_original"/> <div class="media-body faint"> <span class="user-name"> @@ -24,7 +24,7 @@ </div> </div> - <div :class="[userClass, { highlighted: userStyle, 'is-retweet': retweet }]" :style="[ userStyle ]" class="media status"> + <div :class="[userClass, { highlighted: userStyle, 'is-retweet': retweet && !inConversation }]" :style="[ userStyle ]" class="media status"> <div v-if="!noHeading" class="media-left"> <router-link :to="userProfileLink" @click.stop.prevent.capture.native="toggleUserExpanded"> <UserAvatar :compact="compact" :betterShadow="betterShadow" :src="status.user.profile_image_url_original"/> |