diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-03-13 17:31:46 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-03-13 17:31:46 +0000 |
| commit | e34d71fc1f64fde73e435262979e5e93ebd37df2 (patch) | |
| tree | 8b43c0e6f070c7f5a5fd72d1fcc986ca52524ed2 /src/components/status_content/status_content.vue | |
| parent | 89efb0d2f4ab41eb020e6a6b7bb14dbe20e53157 (diff) | |
| parent | 551b8f3690bab1f53ec22ccf6963009a30fa45d0 (diff) | |
Merge branch 'from/develop/tusooa/tree-threading' into 'develop'
Add the option to display threads as trees
See merge request pleroma/pleroma-fe!1407
Diffstat (limited to 'src/components/status_content/status_content.vue')
| -rw-r--r-- | src/components/status_content/status_content.vue | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue index 69635aad..9e7d7956 100644 --- a/src/components/status_content/status_content.vue +++ b/src/components/status_content/status_content.vue @@ -8,6 +8,12 @@ :status="status" :compact="compact" :single-line="singleLine" + :showing-tall="showingTall" + :expanding-subject="expandingSubject" + :showing-long-subject="showingLongSubject" + :toggle-showing-tall="toggleShowingTall" + :toggle-expanding-subject="toggleExpandingSubject" + :toggle-showing-long-subject="toggleShowingLongSubject" @parseReady="$emit('parseReady', $event)" > <div v-if="status.poll && status.poll.options && !compact"> @@ -52,10 +58,6 @@ <script src="./status_content.js" ></script> <style lang="scss"> -@import '../../_variables.scss'; - -$status-margin: 0.75em; - .StatusContent { flex: 1; min-width: 0; |