diff options
| author | wakarimasen <wakarimasen@airmail.cc> | 2017-03-05 14:34:14 +0100 |
|---|---|---|
| committer | wakarimasen <wakarimasen@airmail.cc> | 2017-03-05 14:34:14 +0100 |
| commit | c921662036fe39f5146d5a36b4b018af3cfc2635 (patch) | |
| tree | a5afbde367b54d81f321dbd15cbf5d70d6ac60cb /src/components/status | |
| parent | 6bcbed38d0952a332a900a615bfe8c7a553e8fc4 (diff) | |
Add inConversation prop to status
Diffstat (limited to 'src/components/status')
| -rw-r--r-- | src/components/status/status.js | 7 | ||||
| -rw-r--r-- | src/components/status/status.vue | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/components/status/status.js b/src/components/status/status.js index cca5f7fc..0783604d 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -8,7 +8,8 @@ import UserCardContent from '../user_card_content/user_card_content.vue' const Status = { props: [ 'statusoid', - 'expandable' + 'expandable', + 'inConversation' ], data: () => ({ replying: false, @@ -18,8 +19,8 @@ const Status = { }), computed: { hideAttachments () { - return (this.$store.state.config.hideAttachments && this.expandable) || - (this.$store.state.config.hideAttachmentsInConv && !this.expandable) + return (this.$store.state.config.hideAttachments && !this.inConversation) || + (this.$store.state.config.hideAttachmentsInConv && this.inConversation) }, retweet () { return !!this.statusoid.retweeted_status }, retweeter () { return this.statusoid.user.name }, diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 585bf621..d8dce423 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -1,5 +1,5 @@ <template> - <div class="status-el base00-background" v-if="!status.deleted" v-bind:class="{ 'expanded-status': !expandable }"> + <div class="status-el base00-background" v-if="!status.deleted" v-bind:class="{ 'status-conversation': inConversation }"> <template v-if="muted"> <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> @@ -121,7 +121,7 @@ } } - .expanded-status { + .status-conversation { border-left: 4px solid rgba(255, 48, 16, 0.65); } |
