diff options
| author | Henry Jameson <me@hjkos.com> | 2021-06-18 02:09:50 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2021-06-18 02:09:50 +0300 |
| commit | c1293c3afa9b9a057008026a9d988c6a5b9f516c (patch) | |
| tree | 9b75f29db56579f5160590a8a34a4b0789dab04e /src/components/status_content | |
| parent | f15599e6e57477131ba5592e2874916ed1da06e2 (diff) | |
| parent | a3c703bd37fc55c2377cb0bf099af6a21ea07e8e (diff) | |
Merge branch 'compact-notifs' into proper-attachments
* compact-notifs:
compact notifs
Diffstat (limited to 'src/components/status_content')
| -rw-r--r-- | src/components/status_content/status_content.js | 1 | ||||
| -rw-r--r-- | src/components/status_content/status_content.vue | 13 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js index c085c992..55f701d0 100644 --- a/src/components/status_content/status_content.js +++ b/src/components/status_content/status_content.js @@ -28,6 +28,7 @@ const StatusContent = { name: 'StatusContent', props: [ 'status', + 'compact', 'focused', 'noHeading', 'fullContent', diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue index a9511fbe..c1533b19 100644 --- a/src/components/status_content/status_content.vue +++ b/src/components/status_content/status_content.vue @@ -1,8 +1,12 @@ <template> - <div class="StatusContent"> +<div + class="StatusContent" + :class="{ '-compact': compact }" +> <slot name="header" /> <StatusBody :status="status" + :compact="compact" :single-line="singleLine" :hide-mentions="hideMentions" @parseReady="$emit('parseReady', $event)" @@ -23,7 +27,7 @@ /> <div - v-if="status.card && !noHeading" + v-if="status.card && !noHeading && !compact" class="link-preview media-body" > <link-preview @@ -46,5 +50,10 @@ $status-margin: 0.75em; .StatusContent { flex: 1; min-width: 0; + &.-compact { + flex { + display: flex; + } + } } </style> |