moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/collapse-on-same-line' into 'develop' 

Put conversation 'Collapse' back on the same line with the rest of the heading.'

See merge request !45
This commit is contained in:
lambadalambda 2017-03-07 10:15:41 -05:00
parent aa0d207c94 ae570ea0ff
commit 1057227be3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/conversation/conversation.vue
View File

@ -1,10 +1,10 @@
<template> <template>
<div class="timeline panel panel-default base00-background"> <div class="timeline panel panel-default base00-background">
<div class="panel-heading base01-background base04" style="justify-content:space-between;"> <div class="panel-heading base01-background base04">
Conversation Conversation
<div v-if="collapsable"> <span v-if="collapsable" style="float:right;">
<small><a href="#" @click.prevent="$emit('toggleExpanded')">Collapse</a></small> <small><a href="#" @click.prevent="$emit('toggleExpanded')">Collapse</a></small>
</div> </span>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div class="timeline"> <div class="timeline">