summaryrefslogtreecommitdiff
path: root/animism-align/frontend/app
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2020-09-08 17:16:38 +0200
committerJules Laplace <julescarbon@gmail.com>2020-09-08 17:16:38 +0200
commit9a27f55d7766629d71c2d93bb63609f6e890ae8b (patch)
tree2932e33f02da7c610aa3c0797baca5b2f2be90d4 /animism-align/frontend/app
parent0a6a7fb9b49a2180a68f6c96815ebd9b7f6b5ab7 (diff)
fullscreen carousel stuff
Diffstat (limited to 'animism-align/frontend/app')
-rw-r--r--animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.gallery.js4
-rw-r--r--animism-align/frontend/app/views/viewer/player/components.media/media.carousel.js2
-rw-r--r--animism-align/frontend/app/views/viewer/player/components.media/media.css11
-rw-r--r--animism-align/frontend/app/views/viewer/player/player.fullscreen.css7
4 files changed, 19 insertions, 5 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 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 (
<div
- className='fullscreen-element carousel'
+ className={'fullscreen-element carousel ' + color.label}
style={style}
>
{element.settings.title && <div className='heading'>{element.settings.title}</div>}
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 }) => {
)
})}
</div>,
- <MediaCitation key={'caption_' + media.id} media={currentCaption} />,
+ <MediaCitation key={'caption_' + media.id} media={(currentCaption && currentCaption.title) ? currentCaption : media} />,
<CarouselNav
key={'arrows_' + media.id}
currentSlide={currentSlide}
diff --git a/animism-align/frontend/app/views/viewer/player/components.media/media.css b/animism-align/frontend/app/views/viewer/player/components.media/media.css
index f552eba..86c50a9 100644
--- a/animism-align/frontend/app/views/viewer/player/components.media/media.css
+++ b/animism-align/frontend/app/views/viewer/player/components.media/media.css
@@ -23,6 +23,7 @@
flex-direction: column;
justify-content: space-between;
align-items: center;
+ padding-top: 1rem;
}
.viewer-fullscreen .fullscreen-element.gallery .citation,
.viewer-fullscreen .fullscreen-element.carousel .citation,
@@ -57,7 +58,7 @@
}
.carousel-nav .dots {
position: absolute;
- bottom: 5.5rem;
+ bottom: 6rem;
left: 0;
width: 100%;
display: flex;
@@ -84,6 +85,12 @@
.dots .dot-item.active {
opacity: 1.0;
}
+.carousel.black .dots .dot-circle {
+ background: #fff;
+}
+.carousel.black svg polygon {
+ fill: #fff;
+}
/* carousel */
@@ -103,7 +110,7 @@
}
.viewer-fullscreen .carousel-item {
width: 50vw;
- height: calc(100vh - 8rem);
+ height: calc(100vh - 9rem);
}
/* gallery */
diff --git a/animism-align/frontend/app/views/viewer/player/player.fullscreen.css b/animism-align/frontend/app/views/viewer/player/player.fullscreen.css
index 8d38fa0..263083b 100644
--- a/animism-align/frontend/app/views/viewer/player/player.fullscreen.css
+++ b/animism-align/frontend/app/views/viewer/player/player.fullscreen.css
@@ -53,3 +53,10 @@
background-repeat: no-repeat;
background-position: center center;
}
+.viewer-fullscreen .video {
+ pointer-events: none;
+}
+
+iframe {
+ pointer-events: none;
+} \ No newline at end of file