diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-31 04:10:17 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-31 04:10:17 +0000 |
| commit | 958acbab8d43b7514369f4bc69bc2fe0353eddf2 (patch) | |
| tree | 9c7b9d868f4b1cf8f0e592cdd607999d5484a18c /src/components/conversation/conversation.vue | |
| parent | 48391a45ba8924e20f280868bca78d77a32c3ddd (diff) | |
| parent | 8c07e63f773a15119f3cf773c083fe3b76306c3f (diff) | |
Merge branch 'polish' into 'develop'
Another one of those MR that fixes many many small-to-medium things
Closes #92, #75, #122, #52, #72, and #87
See merge request pleroma/pleroma-fe!324
Diffstat (limited to 'src/components/conversation/conversation.vue')
| -rw-r--r-- | src/components/conversation/conversation.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index bfcd3fe7..e41929fd 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -1,8 +1,8 @@ <template> <div class="timeline panel panel-default"> <div class="panel-heading conversation-heading"> - {{ $t('timeline.conversation') }} - <span v-if="collapsable" style="float:right;"> + <span class="title"> {{ $t('timeline.conversation') }} </span> + <span v-if="collapsable"> <small><a href="#" @click.prevent="$emit('toggleExpanded')">{{ $t('timeline.collapse') }}</a></small> </span> </div> |