From 41052dd5b95cf2813662d8201b206ad2af78da40 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 23 Sep 2020 14:16:16 +0200 Subject: fixing heights of carousels. set media title from fullscreen video --- .../viewer/player/components.inline/inline.text.js | 21 +++++++++------------ .../viewer/player/components.inline/inline.video.js | 13 +++++++------ 2 files changed, 16 insertions(+), 18 deletions(-) (limited to 'animism-align/frontend/app/views/viewer/player/components.inline') diff --git a/animism-align/frontend/app/views/viewer/player/components.inline/inline.text.js b/animism-align/frontend/app/views/viewer/player/components.inline/inline.text.js index 18b026f..d978465 100644 --- a/animism-align/frontend/app/views/viewer/player/components.inline/inline.text.js +++ b/animism-align/frontend/app/views/viewer/player/components.inline/inline.text.js @@ -56,27 +56,24 @@ export const Pullquote = ({ paragraph, currentParagraph, currentAnnotation, onAn ) } -export const SectionHeading = ({ paragraph, currentParagraph, currentAnnotation, onAnnotationClick }) => { +export const SectionHeading = ({ paragraph }) => { if (paragraph.hidden) return null - let className = currentParagraph ? 'section_heading current' : 'section_heading' - const text = paragraph.annotations.map(annotation => annotation.text).join(' ') return ( -
- {ROMAN_NUMERALS[paragraph.sectionIndex]}{'. '}{text} +
+ + {ROMAN_NUMERALS[paragraph.sectionIndex]} + {'. '} + {paragraph.annotations[0].text} +
) } -export const HeadingText = ({ paragraph, currentParagraph, currentAnnotation, onAnnotationClick }) => { +export const HeadingText = ({ paragraph }) => { if (paragraph.hidden) return null - let className = currentParagraph ? 'section_heading current' : 'section_heading' const text = paragraph.annotations.map(annotation => annotation.text).join(' ') return ( -
+
{text}
) diff --git a/animism-align/frontend/app/views/viewer/player/components.inline/inline.video.js b/animism-align/frontend/app/views/viewer/player/components.inline/inline.video.js index 050ade5..cf3043b 100644 --- a/animism-align/frontend/app/views/viewer/player/components.inline/inline.video.js +++ b/animism-align/frontend/app/views/viewer/player/components.inline/inline.video.js @@ -20,6 +20,12 @@ export const MediaVideo = ({ paragraph, media, currentParagraph, onAnnotationCli height: height + 32, backgroundColor: color.backgroundColor, } + const poster = annotation.settings.poster ? { + backgroundImage: 'url(' + item.settings.video.thumbnail_url + ')', + backgroundSize: '50%', + backgroundPosition: 'center center', + backgroundRepeat: 'no-repeat', + } : {} // console.log(annotation.settings) return (
-- cgit v1.2.3-70-g09d2