diff options
| author | lambda <pleromagit@rogerbraun.net> | 2017-11-13 18:17:34 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2017-11-13 18:17:34 +0000 |
| commit | 024b9ca724c90f8ab9ed573a553349e4002b7b95 (patch) | |
| tree | 991c6ec3665f4ceea4c3cfc772bd5daa26a31242 /src/components/conversation/conversation.vue | |
| parent | 8fdedb4c79e4f569b89496ad323d5d69bd39625a (diff) | |
| parent | ab1d1b3dd0f2ea1c44f4ae7a5f08c52d7ea8520c (diff) | |
Merge branch 'feature/in-reply-to-preview-on-timeline' into 'develop'
In-reply-to previews for posts on timeline
See merge request pleroma/pleroma-fe!157
Diffstat (limited to 'src/components/conversation/conversation.vue')
| -rw-r--r-- | src/components/conversation/conversation.vue | 40 |
1 files changed, 1 insertions, 39 deletions
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> |