diff options
| author | lambadalambda <gitgud@rogerbraun.net> | 2017-05-31 08:16:43 -0400 |
|---|---|---|
| committer | lambadalambda <gitgud@rogerbraun.net> | 2017-05-31 08:16:43 -0400 |
| commit | 9723d7285df1ef74f572c07016b11dd1c692ad33 (patch) | |
| tree | 29ed4f4627f0e8cf5b5bad6d2b721410adbc797b /src/components/status/status.vue | |
| parent | bf7190bfca5221d0f81b34f5b7238ca4e9d1380c (diff) | |
| parent | 960577ca28853dfc7a2082e38498290a84749a05 (diff) | |
Merge branch 'feature/notification-improvements' into 'develop'
Feature/notification improvements
See merge request !79
Diffstat (limited to 'src/components/status/status.vue')
| -rw-r--r-- | src/components/status/status.vue | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 8886b551..6fd53420 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -1,5 +1,20 @@ <template> - <div class="status-el base00-background base03-border" v-if="!status.deleted" v-bind:class="[{ 'base01-background': isFocused }, { 'status-conversation': inConversation }]" > + <div class="status-el base00-background" v-if="compact"> + <div @click.prevent="linkClicked" class="status-content" v-html="status.statusnet_html"></div> + <div v-if="loggedIn"> + <div class='status-actions'> + <div> + <a href="#" v-on:click.prevent="toggleReplying"> + <i class="fa icon-reply" :class="{'icon-reply-active': replying}"></i> + </a> + </div> + <retweet-button :status=status></retweet-button> + <favorite-button :status=status></favorite-button> + </div> + </div> + <post-status-form class="reply-body" :reply-to="status.id" :attentions="status.attentions" :repliedUser="status.user" v-on:posted="toggleReplying" v-if="replying"/> + </div> + <div class="status-el base00-background base03-border" v-else-if="!status.deleted" v-bind:class="[{ 'base01-background': isFocused }, { '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> |