summaryrefslogtreecommitdiff
path: root/animism-align/frontend/app/views/viewer/player
diff options
context:
space:
mode:
Diffstat (limited to 'animism-align/frontend/app/views/viewer/player')
-rw-r--r--animism-align/frontend/app/views/viewer/player/components.media/media.css13
-rw-r--r--animism-align/frontend/app/views/viewer/player/player.fullscreen.js5
-rw-r--r--animism-align/frontend/app/views/viewer/player/player.transcript.css2
3 files changed, 12 insertions, 8 deletions
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 bd6b4c0..c43c207 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
@@ -94,12 +94,13 @@
/* carousel */
-.carousel-container {
- margin-top: 0.5rem;
+.inline-element .carousel-container {
margin-bottom: 1.5rem;
- /*padding: 1rem;*/
position: relative;
}
+.inline-element:last-child .carousel-container {
+ margin-bottom: 0;
+}
.carousel-items {
width: 100%;
}
@@ -110,7 +111,7 @@
height: calc(100vh - 1rem);
}
.viewer-fullscreen .carousel-items {
- height: calc(100vh - 9rem);
+ height: calc(100vh - 19rem);
}
.carousel-item {
display: flex;
@@ -121,7 +122,7 @@
position: relative;
display: inline-block;
max-width: 100%;
- max-height: calc(100vh - 10rem);
+ max-height: calc(100vh - 19rem);
background-size: contain;
background-repeat: no-repeat;
background-position: center center;
@@ -130,7 +131,7 @@
width: auto;
height: auto;
max-width: 100%;
- max-height: calc(100vh - 10rem);
+ max-height: calc(100vh - 19rem);
opacity: 0;
pointer-events: none;
/*object-fit: contain;*/
diff --git a/animism-align/frontend/app/views/viewer/player/player.fullscreen.js b/animism-align/frontend/app/views/viewer/player/player.fullscreen.js
index 24fc52e..de90bf2 100644
--- a/animism-align/frontend/app/views/viewer/player/player.fullscreen.js
+++ b/animism-align/frontend/app/views/viewer/player/player.fullscreen.js
@@ -24,9 +24,12 @@ class PlayerFullscreen extends Component {
setCurrentElements() {
const { audio, timeline, currentSection, media } = this.props
const { play_ts } = audio
- const elements = timeline.filter(element => (
+ let elements = timeline.filter(element => (
floatInRange(element.start_ts, play_ts, element.fade_out_start_ts + 0.1)
))
+ if (elements.length && !audio.playing && elements[0].type === 'curtain') {
+ elements.shift()
+ }
// console.log(elements)
if (elements.length) {
const lastElement = elements[elements.length - 1]
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 72faf7b..b1bf64d 100644
--- a/animism-align/frontend/app/views/viewer/player/player.transcript.css
+++ b/animism-align/frontend/app/views/viewer/player/player.transcript.css
@@ -4,7 +4,7 @@
width: 100%;
height: 100%;
overflow-x: hidden;
- overflow-y: scroll;
+ overflow-y: auto;
}
.player-transcript.black {