Merge branch 'features/favicons' into 'develop'
status.vue: Add support for favicons See merge request pleroma/pleroma-fe!1076
This commit is contained in:
commit
e0add7a44e
2 changed files with 12 additions and 0 deletions
|
@ -143,6 +143,11 @@
|
||||||
>
|
>
|
||||||
{{ status.user.screen_name }}
|
{{ status.user.screen_name }}
|
||||||
</router-link>
|
</router-link>
|
||||||
|
<img
|
||||||
|
class="status-favicon"
|
||||||
|
v-if="!!(status.user && status.user.favicon)"
|
||||||
|
:src="status.user.favicon"
|
||||||
|
>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<span class="heading-right">
|
<span class="heading-right">
|
||||||
|
@ -428,6 +433,12 @@ $status-margin: 0.75em;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.status-favicon {
|
||||||
|
height: 18px;
|
||||||
|
width: 18px;
|
||||||
|
margin-right: 0.4em;
|
||||||
|
}
|
||||||
|
|
||||||
.media-heading {
|
.media-heading {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
vertical-align: bottom;
|
vertical-align: bottom;
|
||||||
|
|
|
@ -79,6 +79,7 @@ export const parseUser = (data) => {
|
||||||
const relationship = data.pleroma.relationship
|
const relationship = data.pleroma.relationship
|
||||||
|
|
||||||
output.background_image = data.pleroma.background_image
|
output.background_image = data.pleroma.background_image
|
||||||
|
output.favicon = data.pleroma.favicon
|
||||||
output.token = data.pleroma.chat_token
|
output.token = data.pleroma.chat_token
|
||||||
|
|
||||||
if (relationship) {
|
if (relationship) {
|
||||||
|
|
Loading…
Reference in a new issue