diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-09-29 10:18:37 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-09-29 10:18:37 +0000 |
| commit | 91778a02766602b81ec8737282495aa4b5294d19 (patch) | |
| tree | da6bb6092acfb50b441f3afb5c4cc792e0b2b3a4 /src/components/status/status.vue | |
| parent | 3781e521e64a59c4e38902601555ae01f99d9fce (diff) | |
| parent | f174f289a93e6bef1182a2face00bb809da49d18 (diff) | |
Merge branch 'feat/custom-virtual-scrolling' into 'develop'
Timeline virtual scrolling
See merge request pleroma/pleroma-fe!1043
Diffstat (limited to 'src/components/status/status.vue')
| -rw-r--r-- | src/components/status/status.vue | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 282ad37d..aa67e433 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -16,7 +16,7 @@ /> </div> <template v-if="muted && !isPreview"> - <div class="status-csontainer muted"> + <div class="status-container muted"> <small class="status-username"> <i v-if="muted && retweet" @@ -227,6 +227,7 @@ </span> </a> </StatusPopover> + <span v-else class="reply-to-no-popover" @@ -272,6 +273,8 @@ :no-heading="noHeading" :highlight="highlight" :focused="isFocused" + @mediaplay="addMediaPlaying($event)" + @mediapause="removeMediaPlaying($event)" /> <transition name="fade"> @@ -354,6 +357,7 @@ @onSuccess="clearError" /> </div> + </div> </div> <div @@ -376,4 +380,5 @@ </template> <script src="./status.js" ></script> + <style src="./status.scss" lang="scss"></style> |