diff options
Diffstat (limited to 'animism-align/frontend/app/views/viewer/player')
12 files changed, 16 insertions, 8 deletions
diff --git a/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.gallery.js b/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.gallery.js index 58bcfaa..0549f09 100644 --- a/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.gallery.js +++ b/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.gallery.js @@ -1,6 +1,6 @@ import React from 'react' -import { MediaCitation, Vitrine } from '../components.utility' +import { MediaCitation, Vitrine } from '../components.media' export const FullscreenVitrine = ({ element, media, transitionDuration }) => { const { color } = element diff --git a/animism-align/frontend/app/views/viewer/player/components.inline/inline.gallery.js b/animism-align/frontend/app/views/viewer/player/components.inline/inline.gallery.js index 0086372..d2a460c 100644 --- a/animism-align/frontend/app/views/viewer/player/components.inline/inline.gallery.js +++ b/animism-align/frontend/app/views/viewer/player/components.inline/inline.gallery.js @@ -1,7 +1,7 @@ import React from 'react' import { CURTAIN_COLOR_LOOKUP } from 'app/constants' -import { MediaCitation, Vitrine, Gallery, Carousel, Grid } from '../components.utility' +import { MediaCitation, Vitrine, Gallery, Carousel, Grid } from '../components.media' export const InlineVitrine = ({ paragraph, media, currentParagraph, currentAnnotation, onAnnotationClick, onDoubleClick }) => { const annotation = paragraph.annotations[0] diff --git a/animism-align/frontend/app/views/viewer/player/components.inline/inline.image.js b/animism-align/frontend/app/views/viewer/player/components.inline/inline.image.js index 0e2d205..176d661 100644 --- a/animism-align/frontend/app/views/viewer/player/components.inline/inline.image.js +++ b/animism-align/frontend/app/views/viewer/player/components.inline/inline.image.js @@ -1,6 +1,6 @@ import React, { Component } from 'react' -import { MediaCitation } from '../components.utility' +import { MediaCitation } from '../components.media' export const MediaImage = ({ paragraph, media, currentParagraph, currentAnnotation, onAnnotationClick, onDoubleClick }) => { if (!media.lookup) return <div /> 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 e34bfa6..179c50d 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 @@ -2,7 +2,7 @@ import React, { Component } from 'react' import VimeoPlayer from '@u-wave/react-vimeo' import { CURTAIN_COLOR_LOOKUP } from 'app/constants' -import { MediaCitation } from '../components.utility' +import { MediaCitation } from '../components.media' export const MediaVideo = ({ paragraph, media, currentParagraph, currentAnnotation, onAnnotationClick, onDoubleClick }) => { if (!media.lookup) return <div /> diff --git a/animism-align/frontend/app/views/viewer/player/components.utility/index.js b/animism-align/frontend/app/views/viewer/player/components.media/index.js index 4fcf649..4fcf649 100644 --- a/animism-align/frontend/app/views/viewer/player/components.utility/index.js +++ b/animism-align/frontend/app/views/viewer/player/components.media/index.js diff --git a/animism-align/frontend/app/views/viewer/player/components.utility/media.carousel.js b/animism-align/frontend/app/views/viewer/player/components.media/media.carousel.js index cfd1e48..cfd1e48 100644 --- a/animism-align/frontend/app/views/viewer/player/components.utility/media.carousel.js +++ b/animism-align/frontend/app/views/viewer/player/components.media/media.carousel.js diff --git a/animism-align/frontend/app/views/viewer/player/components.utility/media.citation.js b/animism-align/frontend/app/views/viewer/player/components.media/media.citation.js index 14c8c53..14c8c53 100644 --- a/animism-align/frontend/app/views/viewer/player/components.utility/media.citation.js +++ b/animism-align/frontend/app/views/viewer/player/components.media/media.citation.js diff --git a/animism-align/frontend/app/views/viewer/player/components.utility/media.css b/animism-align/frontend/app/views/viewer/player/components.media/media.css index 62eb9af..62eb9af 100644 --- a/animism-align/frontend/app/views/viewer/player/components.utility/media.css +++ b/animism-align/frontend/app/views/viewer/player/components.media/media.css diff --git a/animism-align/frontend/app/views/viewer/player/components.utility/media.gallery.js b/animism-align/frontend/app/views/viewer/player/components.media/media.gallery.js index da83c4f..da83c4f 100644 --- a/animism-align/frontend/app/views/viewer/player/components.utility/media.gallery.js +++ b/animism-align/frontend/app/views/viewer/player/components.media/media.gallery.js diff --git a/animism-align/frontend/app/views/viewer/player/components.utility/media.grid.js b/animism-align/frontend/app/views/viewer/player/components.media/media.grid.js index 93b8696..93b8696 100644 --- a/animism-align/frontend/app/views/viewer/player/components.utility/media.grid.js +++ b/animism-align/frontend/app/views/viewer/player/components.media/media.grid.js diff --git a/animism-align/frontend/app/views/viewer/player/components.utility/media.vitrine.js b/animism-align/frontend/app/views/viewer/player/components.media/media.vitrine.js index b2c7944..2033465 100644 --- a/animism-align/frontend/app/views/viewer/player/components.utility/media.vitrine.js +++ b/animism-align/frontend/app/views/viewer/player/components.media/media.vitrine.js @@ -2,6 +2,8 @@ import React, { Component } from 'react' import { ZoomPlus } from '../../nav/viewer.icons.js' +import actions from 'app/actions' + export const Vitrine = ({ media }) => { const { image_order, image_lookup, thumbnail_lookup } = media.settings const width = (Math.floor(100 / image_order.length * 2) - 2) + 'vw' @@ -11,16 +13,22 @@ export const Vitrine = ({ media }) => { {image_order.map(id => { const thumbnail = thumbnail_lookup[id] return ( - <VitrineItem key={id} image={thumbnail} width={width} /> + <VitrineItem + key={id} + media={media} + id={id} + image={thumbnail} + width={width} + /> ) })} </div> ) } -const VitrineItem = ({ image, width }) => { +const VitrineItem = ({ media, id, image, width }) => { return ( - <div className='vitrine-item' style={{ width }}> + <div className='vitrine-item' style={{ width }} onClick={() => actions.viewer.openVitrineModal(media, id)}> <div className='vitrine-image'> <img src={image.url} /> </div> 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 69abda2..d771424 100644 --- a/animism-align/frontend/app/views/viewer/player/player.transcript.css +++ b/animism-align/frontend/app/views/viewer/player/player.transcript.css @@ -168,7 +168,7 @@ color: white; font-family: "Freight Text", serif; font-size: 12vh; - line-height: 1.3; + line-height: 1.25; text-align: center; } .site-intro .inner span { |