From 9a27f55d7766629d71c2d93bb63609f6e890ae8b Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 8 Sep 2020 17:16:38 +0200 Subject: fullscreen carousel stuff --- .../viewer/player/components.fullscreen/fullscreen.gallery.js | 4 ++-- .../views/viewer/player/components.media/media.carousel.js | 2 +- .../app/views/viewer/player/components.media/media.css | 11 +++++++++-- .../frontend/app/views/viewer/player/player.fullscreen.css | 7 +++++++ 4 files changed, 19 insertions(+), 5 deletions(-) (limited to 'animism-align/frontend/app') 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 9cd2787..5490b35 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 @@ -41,8 +41,8 @@ export const FullscreenGallery = ({ element, media, transitionDuration }) => { } export const FullscreenCarousel = ({ element, media, transitionDuration }) => { - const { color } = element const item = media.lookup[element.settings.media_id] + const color = element.color || CURTAIN_COLOR_LOOKUP.white const style = { backgroundColor: color.backgroundColor, color: color.textColor, @@ -50,7 +50,7 @@ export const FullscreenCarousel = ({ element, media, transitionDuration }) => { } return (
{element.settings.title &&
{element.settings.title}
} diff --git a/animism-align/frontend/app/views/viewer/player/components.media/media.carousel.js b/animism-align/frontend/app/views/viewer/player/components.media/media.carousel.js index edaa209..bbfe520 100644 --- a/animism-align/frontend/app/views/viewer/player/components.media/media.carousel.js +++ b/animism-align/frontend/app/views/viewer/player/components.media/media.carousel.js @@ -36,7 +36,7 @@ export const Carousel = ({ media }) => { ) })}
, - , + ,