From b60d3053c73b07506bcbef7897ef13fce8045c2e Mon Sep 17 00:00:00 2001 From: Lachlan Kermode Date: Thu, 3 Jan 2019 12:36:36 +0000 Subject: [PATCH] fix media describing logic --- src/components/SourceOverlay.jsx | 6 +++--- src/reducers/schema/sourceSchema.js | 4 ++-- src/scss/mediaoverlay.scss | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/components/SourceOverlay.jsx b/src/components/SourceOverlay.jsx index 02f40bf..0ab9db8 100644 --- a/src/components/SourceOverlay.jsx +++ b/src/components/SourceOverlay.jsx @@ -112,9 +112,9 @@ function SourceOverlay ({ source, onCancel }) { return (
- {img ? `${img}, `: ''} - {(vid && txt) ? `${vid}, `: vid} - {txt} + {img ? img : ''} + {vid ? `, ${vid}`: ''} + {txt ? `, ${txt}`: ''}
) } diff --git a/src/reducers/schema/sourceSchema.js b/src/reducers/schema/sourceSchema.js index 523bf9d..1b61ac0 100644 --- a/src/reducers/schema/sourceSchema.js +++ b/src/reducers/schema/sourceSchema.js @@ -6,8 +6,8 @@ const sourceSchema = Joi.object().keys({ thumbnail: Joi.string().allow(''), paths: Joi.array().required(), type: Joi.string().allow(''), - affil_1: Joi.string().allow(''), - affil_2: Joi.string().allow(''), + // affil_1: Joi.string().allow(''), + // affil_2: Joi.string().allow(''), url: Joi.string().allow(''), desc: Joi.string().allow(''), parent: Joi.string().allow(''), diff --git a/src/scss/mediaoverlay.scss b/src/scss/mediaoverlay.scss index ebc4a62..0fa1270 100644 --- a/src/scss/mediaoverlay.scss +++ b/src/scss/mediaoverlay.scss @@ -57,6 +57,7 @@ $header-inset: 10px; align-items: center; height: 80vh; max-width: 90vw; + box-shadow: 0 19px 19px rgba(0, 0, 0, 0.3), 0 15px 12px rgba(0, 0, 0, 0.22); .mo-media-container { flex: 1;