fix media describing logic

This commit is contained in:
Lachlan Kermode
2019-01-03 12:36:36 +00:00
parent 43a861ca6f
commit b60d3053c7
3 changed files with 6 additions and 5 deletions

View File

@@ -112,9 +112,9 @@ function SourceOverlay ({ source, onCancel }) {
return ( return (
<div> <div>
{img ? `${img}, `: ''} {img ? img : ''}
{(vid && txt) ? `${vid}, `: vid} {vid ? `, ${vid}`: ''}
{txt} {txt ? `, ${txt}`: ''}
</div> </div>
) )
} }

View File

@@ -6,8 +6,8 @@ const sourceSchema = Joi.object().keys({
thumbnail: Joi.string().allow(''), thumbnail: Joi.string().allow(''),
paths: Joi.array().required(), paths: Joi.array().required(),
type: Joi.string().allow(''), type: Joi.string().allow(''),
affil_1: Joi.string().allow(''), // affil_1: Joi.string().allow(''),
affil_2: Joi.string().allow(''), // affil_2: Joi.string().allow(''),
url: Joi.string().allow(''), url: Joi.string().allow(''),
desc: Joi.string().allow(''), desc: Joi.string().allow(''),
parent: Joi.string().allow(''), parent: Joi.string().allow(''),

View File

@@ -57,6 +57,7 @@ $header-inset: 10px;
align-items: center; align-items: center;
height: 80vh; height: 80vh;
max-width: 90vw; 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 { .mo-media-container {
flex: 1; flex: 1;