diff options
author | ThibG <thib@sitedethib.com> | 2020-07-05 22:55:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-05 22:55:09 +0200 |
commit | 94e09d309cb068ea92919767e40e655260ac43cb (patch) | |
tree | 8c41900d4f4c8a94cb5a2feee1af2080ae2dec15 /app/javascript/flavours/glitch/features/status | |
parent | 9b3677d5097fb50f90a6abdce9d722e81d2db469 (diff) | |
parent | 69cddc3909924b5a2ce02f85932fb41f88faf0db (diff) |
Merge pull request #1371 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/status')
-rw-r--r-- | app/javascript/flavours/glitch/features/status/components/detailed_status.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/status/components/detailed_status.js b/app/javascript/flavours/glitch/features/status/components/detailed_status.js index d57335612..2d878675c 100644 --- a/app/javascript/flavours/glitch/features/status/components/detailed_status.js +++ b/app/javascript/flavours/glitch/features/status/components/detailed_status.js @@ -143,7 +143,9 @@ export default class DetailedStatus extends ImmutablePureComponent { alt={attachment.get('description')} duration={attachment.getIn(['meta', 'original', 'duration'], 0)} poster={attachment.get('preview_url') || status.getIn(['account', 'avatar_static'])} - blurhash={attachment.get('blurhash')} + backgroundColor={attachment.getIn(['meta', 'colors', 'background'])} + foregroundColor={attachment.getIn(['meta', 'colors', 'foreground'])} + accentColor={attachment.getIn(['meta', 'colors', 'accent'])} height={150} /> ); |