Commit e0add7a4 authored by Shpuld Shpludson's avatar Shpuld Shpludson

Merge branch 'features/favicons' into 'develop'

status.vue: Add support for favicons

See merge request !1076
parents 92377bea c4340ad4
Pipeline #28844 passed with stages
in 11 minutes and 51 seconds
......@@ -143,6 +143,11 @@
>
{{ status.user.screen_name }}
</router-link>
<img
class="status-favicon"
v-if="!!(status.user && status.user.favicon)"
:src="status.user.favicon"
>
</div>
<span class="heading-right">
......@@ -428,6 +433,12 @@ $status-margin: 0.75em;
}
}
.status-favicon {
height: 18px;
width: 18px;
margin-right: 0.4em;
}
.media-heading {
padding: 0;
vertical-align: bottom;
......
......@@ -79,6 +79,7 @@ export const parseUser = (data) => {
const relationship = data.pleroma.relationship
output.background_image = data.pleroma.background_image
output.favicon = data.pleroma.favicon
output.token = data.pleroma.chat_token
if (relationship) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment