diff options
| author | Hakaba Hitoyo <example@example.com> | 2018-04-22 00:48:06 +0900 |
|---|---|---|
| committer | Hakaba Hitoyo <example@example.com> | 2018-04-22 00:48:06 +0900 |
| commit | 033170212f59ee2e0757fcc0264f64a15e638f64 (patch) | |
| tree | bc592c1d90070e2d6b8854556bdc2f710b670fae /src/components/conversation/conversation.vue | |
| parent | ef67bd693e9ee0cb42b4ebd0b10f68e63ba04750 (diff) | |
| parent | b6eb1b1d98c839f5340edd3d3c4764952f2cb189 (diff) | |
merge
Diffstat (limited to 'src/components/conversation/conversation.vue')
| -rw-r--r-- | src/components/conversation/conversation.vue | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 60d43fff..308e5e7d 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -1,6 +1,6 @@ <template> <div class="timeline panel panel-default"> - <div class="panel-heading base02-background base04 base03-border conversation-heading"> + <div class="panel-heading conversation-heading"> {{ $t('timeline.conversation') }} <span v-if="collapsable" style="float:right;"> <small><a href="#" @click.prevent="$emit('toggleExpanded')">Collapse</a></small> @@ -8,7 +8,16 @@ </div> <div class="panel-body"> <div class="timeline"> - <status v-for="status in conversation" @goto="setHighlight" :key="status.id" :statusoid="status" :expandable='false' :focused="focused(status.id)" :inConversation='true' :highlight="highlight" :replies="getReplies(status.id)"></status> + <status + v-for="status in conversation" + @goto="setHighlight" :key="status.id" + :inlineExpanded="collapsable" :statusoid="status" + :expandable='false' :focused="focused(status.id)" + :inConversation='true' + :highlight="highlight" + :replies="getReplies(status.id)" + class="status-fadein"> + </status> </div> </div> </div> |