From ea8d34a720dc4c24c6e58aeb34d0ef2fa328eb69 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 21 Sep 2020 22:02:46 +0200 Subject: color background on vitrine modal if it is set --- .../viewer/player/components.fullscreen/fullscreen.gallery.js | 2 +- .../app/views/viewer/player/components.inline/inline.gallery.js | 2 +- .../app/views/viewer/player/components.media/media.vitrine.js | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'animism-align/frontend/app/views/viewer/player') 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 933227b..530048d 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 @@ -17,7 +17,7 @@ export const FullscreenVitrine = ({ element, media, transitionDuration }) => { style={style} > {element.settings.title &&
{element.settings.title}
} - + ) 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 3ac8fc6..647b545 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 @@ -17,7 +17,7 @@ export const InlineVitrine = ({ paragraph, media, onAnnotationClick }) => { style={style} > {annotation.settings.title &&
{annotation.settings.title}
} - + ) // diff --git a/animism-align/frontend/app/views/viewer/player/components.media/media.vitrine.js b/animism-align/frontend/app/views/viewer/player/components.media/media.vitrine.js index ae0bfd7..1e5fca2 100644 --- a/animism-align/frontend/app/views/viewer/player/components.media/media.vitrine.js +++ b/animism-align/frontend/app/views/viewer/player/components.media/media.vitrine.js @@ -4,7 +4,7 @@ import { ZoomPlus } from '../../nav/viewer.icons.js' import actions from 'app/actions' -export const Vitrine = ({ media }) => { +export const Vitrine = ({ media, color }) => { const { image_order, image_lookup, thumbnail_lookup } = media.settings let width = (Math.floor(100 / image_order.length * 2)) if (image_order.length % 2) { @@ -23,6 +23,7 @@ export const Vitrine = ({ media }) => { id={id} image={thumbnail} width={displayWidth} + color={color} /> ) })} @@ -30,9 +31,9 @@ export const Vitrine = ({ media }) => { ) } -const VitrineItem = ({ media, id, image, width }) => { +const VitrineItem = ({ media, id, image, width, color }) => { return ( -
actions.viewer.openVitrineModal(media, id)}> +
actions.viewer.openVitrineModal(media, color, id)}>
-- cgit v1.2.3-70-g09d2