From ab1d1b3dd0f2ea1c44f4ae7a5f08c52d7ea8520c Mon Sep 17 00:00:00 2001
From: shpuld <shp@cock.li>
Date: Mon, 13 Nov 2017 16:33:54 +0200
Subject: Move previews from conversation to status, put the reply preview
 arrow back on timeline statuses, add a spinner when the preview is still
 loading.

---
 src/components/conversation/conversation.vue | 40 +---------------------------
 1 file changed, 1 insertion(+), 39 deletions(-)

(limited to 'src/components/conversation/conversation.vue')

diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 3dea4985..201afcd5 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -8,48 +8,10 @@
     </div>
     <div class="panel-body">
       <div class="timeline">
-        <status v-for="status in conversation" @goto="setHighlight" :key="status.id" @preview="setPreview"  :statusoid="status" :expandable='false' :focused="focused(status.id)" :inConversation='true' :highlight="highlight" :replies="getReplies(status.id)"></status>
-      </div>
-    </div>
-    <div class="status-preview base00-background base03-border" :style="{ left: preview.x + 'px', top: preview.y + 'px'}" v-if="preview.status">
-      <img class="avatar" :src="preview.status.user.profile_image_url_original">
-      <div class="text">
-        <h4>
-          {{ preview.status.user.name }}
-          <small><a>{{ preview.status.user.screen_name}}</a></small>
-        </h4>
-        <div @click.prevent="linkClicked" class="status-content" v-html="preview.status.statusnet_html"></div>
+        <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>
       </div>
     </div>
   </div>
 </template>
 
 <script src="./conversation.js"></script>
-
-<style lang="scss">
-  .status-preview {
-    position: absolute;
-    max-width: 35em;
-    padding: 0.5em;
-    display: flex;
-    border-color: inherit;
-    border-style: solid;
-    border-width: 1px;
-    border-radius: 4px;
-    box-shadow: 2px 2px 3px rgba(0, 0, 0, 0.5);
-    .avatar {
-      width: 32px;
-      height: 32px;
-      border-radius: 50%;
-    }
-    .text {
-      h4 {
-        margin-bottom: 0.4em;
-        small {
-          font-weight: lighter;
-        }
-      }
-      padding: 0 0.5em 0.5em 0.5em;
-    }
-  }
-</style>
-- 
cgit v1.2.3-70-g09d2