#468 - show pinned timeline and add pinned label to the status

2019-04-04 15:10:34 -04:00 · 2019-04-04 15:10:34 -04:00 · 2c89d49a3d
commit 2c89d49a3d
parent e28b19645a
11 changed files with 69 additions and 18 deletions
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@ -41,7 +41,8 @@ const conversation = {
  props: [
    'statusoid',
    'collapsable',
-    'isPage'
+    'isPage',
+    'pinned'
  ],
  created () {
    if (this.isPage) {
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@ -13,6 +13,7 @@
      :key="status.id"
      :inlineExpanded="collapsable && isExpanded"
      :statusoid="status"
+      :pinned="pinned"
      :expandable='!isExpanded'
      :focused="focused(status.id)"
      :inConversation="isExpanded"