diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-03-09 09:19:40 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-03-09 09:19:40 +0100 |
| commit | 2f52669380703030aa8e197deb05240c5f3bf979 (patch) | |
| tree | 5b40b0d4efd3d132c8bdd321092ce2bd5fb8a0e6 /src/components/conversation/conversation.vue | |
| parent | c921662036fe39f5146d5a36b4b018af3cfc2635 (diff) | |
| parent | 64d71b75cfed41d82a99e3e478fc75d5f81f84bd (diff) | |
Merge branch 'develop' into wakarimasen/pleroma-fe-develop
Diffstat (limited to 'src/components/conversation/conversation.vue')
| -rw-r--r-- | src/components/conversation/conversation.vue | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 8e24fcbe..331cce99 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -2,13 +2,13 @@ <div class="timeline panel panel-default base00-background"> <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"> - <status v-for="status in conversation" :key="status.id" v-bind:statusoid="status":expandable='false':inConversation='true'></status> + <status v-for="status in conversation" :key="status.id" :statusoid="status" :expandable='false' :focused="focused(status.id)" :inConversation='true'></status> </div> </div> </div> |