diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-07-20 14:06:16 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-07-20 14:06:16 +0000 |
| commit | e0add7a44e6d626ddfcb5869cf5cade719ca2061 (patch) | |
| tree | af77eaa4ff74e93142c8db3946cb26da74213167 /src | |
| parent | 92377beab12cf55df146fce417ba17276515fa61 (diff) | |
| parent | c4340ad46786cef557a2cc11d1248fcfef16d366 (diff) | |
Merge branch 'features/favicons' into 'develop'
status.vue: Add support for favicons
See merge request pleroma/pleroma-fe!1076
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/status/status.vue | 11 | ||||
| -rw-r--r-- | src/services/entity_normalizer/entity_normalizer.service.js | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/components/status/status.vue b/src/components/status/status.vue index f6b5dd6f..1ecff49c 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -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; diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index 7ea8a16c..c1bf8535 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -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) { |