From a6b69ff61df499942f0a39955a3b7cb5e0087913 Mon Sep 17 00:00:00 2001 From: Lachlan Kermode Date: Fri, 16 Aug 2019 16:05:54 +0100 Subject: [PATCH] translations always show over video --- src/components/Overlay/Content.js | 11 ++++++++++- src/components/Overlay/Media.js | 17 +++++++---------- src/scss/overlay.scss | 15 ++++++++------- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/src/components/Overlay/Content.js b/src/components/Overlay/Content.js index 422f789..8c3d669 100644 --- a/src/components/Overlay/Content.js +++ b/src/components/Overlay/Content.js @@ -5,7 +5,7 @@ import Md from './Md' import Spinner from '../presentational/Spinner' import NoSource from '../presentational/NoSource' -export default ({ media, viewIdx }) => { +export default ({ media, viewIdx, translations, switchLanguage, langIdx }) => { const el = document.querySelector(`.source-media-gallery`) const shiftW = el ? el.getBoundingClientRect().width : 0 @@ -26,6 +26,15 @@ export default ({ media, viewIdx }) => { case 'Video': return (
+
+ {translations ? translations.map((trans, idx) => ( + langIdx !== idx + 1 ? ( +
switchLanguage(idx + 1)}>{trans.code}
+ ) : ( +
switchLanguage(0)}>EN
+ ) + )) : null} +
{shortenedTitle} -
- {this.props.translations ? this.props.translations.map((trans, idx) => ( - this.state.langIdx !== idx + 1 ? ( -
this.switchLanguage(idx + 1)}>{trans.code}
- ) : ( -
this.switchLanguage(0)}>EN
- ) - )) : null} -
e.stopPropagation()}>
- selectTypeFromPathWithPoster(p, poster))} viewIdx={this.state.mediaIdx} /> + this.switchLanguage(lang)} + translations={this.props.translations} + langIdx={this.state.langIdx} + media={paths.map(p => selectTypeFromPathWithPoster(p, poster))} + viewIdx={this.state.mediaIdx} + />
diff --git a/src/scss/overlay.scss b/src/scss/overlay.scss index 0c6dc30..61e7ad1 100644 --- a/src/scss/overlay.scss +++ b/src/scss/overlay.scss @@ -42,14 +42,14 @@ $overlay-bg: rgba(239,239,239,0.9); top: 0; width: 100%; display: flex; - justify-content: space-between; + justify-content: center; align-items: stretch; flex-direction: row; .mo-banner-close { - display: flex; - justify-content: center; - align-items: center; + position: fixed; + top: 20px; + left: 20px; min-width: $banner-height; width: $banner-height; .material-icons { @@ -74,13 +74,11 @@ $overlay-bg: rgba(239,239,239,0.9); display: flex; justify-content: center; align-items: center; - margin-left: $banner-height; // to offset the 2*$banner-height below &.h3 { border-radius: 2px; padding: 10px 15px; background-color: transparent; color: $overlay-bg; - margin-left: -$banner-height; } } } @@ -326,7 +324,10 @@ $overlay-bg: rgba(239,239,239,0.9); min-width: 100%; height: 100%; min-height: 100%; - align-self: center; + display: block; + // align-self: center; + // display: flex; + // flex-direction: column; } .source-image, .source-video {