diff options
| author | Jules Laplace <julescarbon@gmail.com> | 2020-08-10 16:43:07 +0200 |
|---|---|---|
| committer | Jules Laplace <julescarbon@gmail.com> | 2020-08-10 16:43:07 +0200 |
| commit | d688599a8ce3f2051a13fcd9de0f89b6fd0e6406 (patch) | |
| tree | e644cb60cc4ebd43c0394d9cb993046df354db3a /animism-align | |
| parent | 2eeedc8e328bd42fd2f5f17d9e047cd8db550ec5 (diff) | |
inline video css
Diffstat (limited to 'animism-align')
3 files changed, 24 insertions, 10 deletions
diff --git a/animism-align/frontend/app/views/viewer/player/components.inline/inline.utility.js b/animism-align/frontend/app/views/viewer/player/components.inline/inline.utility.js index dd4dbfe..2d70038 100644 --- a/animism-align/frontend/app/views/viewer/player/components.inline/inline.utility.js +++ b/animism-align/frontend/app/views/viewer/player/components.inline/inline.utility.js @@ -9,14 +9,25 @@ export const Intro = ({ paragraph, media, currentParagraph, currentAnnotation, o backgroundImage: 'url(' + item.settings.file.url + ')', } return ( - <div - className={className} - style={style} - > - <div className='inner'> - {annotation.settings.title && <span dangerouslySetInnerHTML={{ __html: annotation.settings.title }} />} - {annotation.settings.subtitle && <span dangerouslySetInnerHTML={{ __html: annotation.settings.subtitle }} />} + <div> + <div + className='site-intro' + style={style} + > + <div className='inner'> + {annotation.settings.title && <span dangerouslySetInnerHTML={{ __html: annotation.settings.title }} />} + {annotation.settings.subtitle && <span dangerouslySetInnerHTML={{ __html: annotation.settings.subtitle }} />} + </div> + </div> + <div className='schedule'> + <div>Schedule</div> + <div> + </div> </div> </div> ) } + +const schedule = [ + { date: 'Mon 00-00, 2020', title: 'Episode 1: ' }, +]
\ No newline at end of file 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 74303b5..731c436 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 @@ -8,7 +8,7 @@ import { MediaCitation } from './inline.image' export const MediaVideo = ({ paragraph, media, currentParagraph, currentAnnotation, onAnnotationClick, onDoubleClick }) => { if (!media.lookup) return <div /> // const { color } = element - const className = currentParagraph ? 'media current' : 'media' + const className = currentParagraph ? 'media video current' : 'media video' const annotation = paragraph.annotations[0] const item = media.lookup[annotation.settings.media_id] const color = CURTAIN_COLOR_LOOKUP[annotation.settings.color] || CURTAIN_COLOR_LOOKUP.white @@ -22,10 +22,10 @@ export const MediaVideo = ({ paragraph, media, currentParagraph, currentAnnotati className={className} onDoubleClick={e => onDoubleClick(e, paragraph)} > - <div style={style}> + <div className='videoPlayer' style={style}> <VimeoPlayer video={item.url} - autoplay={item.autoplay} + autoplay={item.settings.autoplay} muted controls={false} byline={false} diff --git a/animism-align/frontend/app/views/viewer/player/player.transcript.css b/animism-align/frontend/app/views/viewer/player/player.transcript.css index cbf4b38..cae31ca 100644 --- a/animism-align/frontend/app/views/viewer/player/player.transcript.css +++ b/animism-align/frontend/app/views/viewer/player/player.transcript.css @@ -136,6 +136,9 @@ font-family: "Neue Haas Unica"; color: #888; } +.player-transcript .media.video .videoPlayer { + padding: 1rem 0; +} /* intro */ |
