1 files changed, 23 insertions, 8 deletions
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 42d009c9..b208d540 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -1,9 +1,9 @@
 <template>
-  <div class="timeline panel panel-default">
-    <div class="panel-heading conversation-heading">
+  <div class="timeline panel-default" :class="[expanded ? 'panel' : 'panel-disabled']">
+    <div v-if="expanded" class="panel-heading conversation-heading">
       <span class="title"> {{ $t('timeline.conversation') }} </span>
       <span v-if="collapsable">
-        <a href="#" @click.prevent="$emit('toggleExpanded')">{{ $t('timeline.collapse') }}</a>
+        <a href="#" @click.prevent="toggleExpanded">{{ $t('timeline.collapse') }}</a>
       </span>
     </div>
     <div class="panel-body">
@@ -11,15 +11,14 @@
         <status
           v-for="status in conversation"
           @goto="setHighlight"
-          @toggleReplying="toggleReplying"
-          :replying="replying && status.id === statusId"
+          @toggleExpanded="toggleExpanded"
           :key="status.id"
           :inlineExpanded="collapsable"
           :statusoid="status"
-          :expandable='false'
+          :expandable='!expanded'
           :focused="focused(status.id)"
-          :inConversation='true'
-          :highlight="highlight"
+          :inConversation="expanded"
+          :highlight="getHighlight()"
           :replies="getReplies(status.id)"
           class="status-fadein"
         />
@@ -29,3 +28,19 @@
 </template>
 
 <script src="./conversation.js"></script>
+
+<style lang="scss">
+@import '../../_variables.scss';
+
+.timeline {
+  .panel-disabled {
+    .status-el {
+      border-left: none;
+      border-bottom-width: 1px;
+      border-bottom-style: solid;
+      border-color: var(--border, $fallback--border);
+      border-radius: 0;
+    }
+  }
+}
+</style>