pleroma-fe

commit: 1057227be38fc6af0e7f128f30ff2b991a60c34f
parent: aa0d207c945d61678801910719b0b013df75a78a
Author: lambadalambda <gitgud@rogerbraun.net>
Date:   Tue,  7 Mar 2017 10:15:41 -0500

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
Diffstat:
M
src/components/conversation/conversation.vue
6
+++---

1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
@@ -1,10 +1,10 @@
 <template>
   <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
-      <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">