diff options
6 files changed, 20 insertions, 17 deletions
diff --git a/animism-align/frontend/app/utils/vendor/keen-slider/keen-slider.js b/animism-align/frontend/app/utils/vendor/keen-slider/keen-slider.js index dec451e..d1d0e46 100644 --- a/animism-align/frontend/app/utils/vendor/keen-slider/keen-slider.js +++ b/animism-align/frontend/app/utils/vendor/keen-slider/keen-slider.js @@ -189,9 +189,11 @@ function KeenSlider(initialContainer, initialOptions = {}) { eventAdd(container, 'touchcancel', eventDragStop, { passive: true, }) - eventAdd(window, 'wheel', eventWheel, { - passive: false, - }) + if (initialOptions.withMouseWheel) { + eventAdd(window, 'wheel', eventWheel, { + passive: false, + }) + } } function eventsRemove() { 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 7ba63f4..933227b 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 @@ -54,7 +54,7 @@ export const FullscreenCarousel = ({ element, media, transitionDuration }) => { style={style} > {element.settings.title && <div className='heading'>{element.settings.title}</div>} - <Carousel element={element} media={item} withCitation /> + <Carousel element={element} media={item} withCitation withMouseWheel /> </div> ) } diff --git a/animism-align/frontend/app/views/viewer/player/components.inline/inline.utility.js b/animism-align/frontend/app/views/viewer/player/components.inline/inline.utility.js index 2d2e3cb..33f12f4 100644 --- a/animism-align/frontend/app/views/viewer/player/components.inline/inline.utility.js +++ b/animism-align/frontend/app/views/viewer/player/components.inline/inline.utility.js @@ -81,14 +81,6 @@ export const Schedule = ({ media }) => { {Array.from(nameLookup).sort().join("\n")} </div> </div> - <div> - <div className='credits-title'> - Sponsors - </div> - <div className='credits-info'> - {ABOUT.sponsors} - </div> - </div> </div> </div> ) @@ -106,5 +98,4 @@ const SCHEDULE = [ const ABOUT = { curator: "Anselm Franke", authors: "Anselm Franke\nAmal Issa", - sponsors: "This\nThis\nThis", -}
\ No newline at end of file +} 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 8d91675..6d08e28 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 @@ -15,7 +15,7 @@ const SLIDES_PER_VIEW = 2 let slideChangedHook = slider => console.log(slider) let slideChanged = slider => slideChangedHook(slider) -const CarouselContainer = ({ element, media, play_ts }) => { +const CarouselContainer = ({ element, media, play_ts, withMouseWheel }) => { const { image_order, caption_lookup } = media.settings const [currentSlide, setCurrentSlide] = React.useState(0) @@ -26,6 +26,7 @@ const CarouselContainer = ({ element, media, play_ts }) => { centered: true, loop: false, slideChanged: slideChanged, + withMouseWheel: withMouseWheel, }) slideChangedHook = s => { 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 cb15150..2296d73 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 @@ -97,7 +97,9 @@ .carousel-container { margin-top: 0.5rem; margin-bottom: 1.5rem; - padding: 1rem; + /*padding: 1rem;*/ + height: calc(100vh - 1rem); + position: relative; } .carousel-items { width: 100%; @@ -140,6 +142,13 @@ .viewer-fullscreen .carousel .citation { height: 5rem; } +.player-transcript .media .citation { + height: 9rem; + padding-top: 4rem; +} +.player-transcript .carousel-nav .dots { + bottom: 5rem; +} /* gallery */ 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 8d930ef..8426c8c 100644 --- a/animism-align/frontend/app/views/viewer/player/player.transcript.css +++ b/animism-align/frontend/app/views/viewer/player/player.transcript.css @@ -288,7 +288,7 @@ padding-bottom: 1rem; } .credits > div { - width: 10.5rem; + width: 14.5rem; margin-right: 1rem; } .credits > div:last-child { |