sam/pleroma-fe
sam/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'features/favicons' into 'develop'

Browse source 
status.vue: Add support for favicons

See merge request pleroma/pleroma-fe!1076
This commit is contained in:
Shpuld Shpludson 2020-07-20 14:06:16 +00:00
parent 92377beab1 c4340ad467
commit e0add7a44e
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/components/status/status.vue
View file

@ -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;

1
src/services/entity_normalizer/entity_normalizer.service.js
View file

@ -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) {