@@ -143,12 +143,15 @@ function SourceOverlay ({ source, onCancel }) {
- {title?
{title}
: null}
+ {title?
{title}
: null}
{_renderCounts(counts)}
- {type ?
{type}
: null}
- {date ?
Date:{date}
: null}
- {url ?
: null}
-
+ {type ?
Media type
: null}
+ {type ?
perm_media{type}
: null}
+ {date ?
Date
: null}
+ {date ?
today{date}
: null}
+ {url ?
Link
: null}
+ {url ?
linkLink to original URL : null}
+ {desc ?
: null}
{desc ?
{desc}
: null}
diff --git a/src/components/Timeline.jsx b/src/components/Timeline.jsx
index 535fa27..a05c5e3 100644
--- a/src/components/Timeline.jsx
+++ b/src/components/Timeline.jsx
@@ -71,7 +71,7 @@ class Timeline extends React.Component {
let element = document.querySelector('.timeline-wrapper');
element.addEventListener("transitionend", (event) => {
this.computeDims();
- }, { once: true });
+ });
}
diff --git a/src/components/presentational/NoSource.js b/src/components/presentational/NoSource.js
index ebd6751..d5c8701 100644
--- a/src/components/presentational/NoSource.js
+++ b/src/components/presentational/NoSource.js
@@ -4,10 +4,10 @@ const NoSource = ({ failedUrls }) => {
return (
-
- error
-
-
No media found, as the original media has not yet been uploaded to the platform.
+
+ error
+
+
No media found, as the original media has not yet been uploaded to the platform.
)
diff --git a/src/reducers/schema/sourceSchema.js b/src/reducers/schema/sourceSchema.js
index 1b61ac0..8ee91fc 100644
--- a/src/reducers/schema/sourceSchema.js
+++ b/src/reducers/schema/sourceSchema.js
@@ -6,10 +6,9 @@ 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_s: Joi.array().allow(''),
url: Joi.string().allow(''),
- desc: Joi.string().allow(''),
+ desc: Joi.string().allow(''),
parent: Joi.string().allow(''),
author: Joi.string().allow(''),
date: Joi.string().allow(''),
diff --git a/src/scss/mediaoverlay.scss b/src/scss/mediaoverlay.scss
index ae72493..564a18a 100644
--- a/src/scss/mediaoverlay.scss
+++ b/src/scss/mediaoverlay.scss
@@ -3,6 +3,7 @@ $panel-height: 700px;
$vimeo-width: $panel-width - 100;
$vimeo-height: $panel-height / 2;
+$padding: 20px;
$header-inset: 10px;
.mo-overlay {
@@ -19,33 +20,6 @@ $header-inset: 10px;
z-index: 20;
}
-.mo-header {
- min-height: 38px;
- max-height: 38px;
- width: 100%;
- display: flex;
- flex-direction: row;
- justify-content: flex-end;
- background-color: black;
- color: white;
-
- .mo-header-close {
- display: flex;
- justify-content: center;
- align-items: center;
- margin-left: $header-inset + 8px;
- }
-
- .mo-header-text {
- flex: 1;
- margin-left: -4em;
- margin-right: $header-inset;
- display: flex;
- align-items: center;
- justify-content: right;
- }
-}
-
.mo-container {
background-color: rgba(239, 239, 239, 0.9);
// max-width: $panel-width;
@@ -68,11 +42,39 @@ $header-inset: 10px;
}
}
+.mo-header {
+ min-height: 42px;
+ max-height: 42px;
+ width: 100%;
+ display: flex;
+ flex-direction: row;
+ background-color: black;
+ color: white;
+
+ .mo-header-close {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin-left: $header-inset + 8px;
+ }
+
+ .mo-header-text {
+ flex: 1;
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ padding-right: $padding;
+ font-family: "Lato", Helvetica, sans-serif;
+ }
+}
+
.mo-media-container {
- font-family: "Lato", Helvetica, sans-serif;
+ box-sizing: border-box;
min-width: 100%;
max-height: 60vh;
+ padding: 20px;
overflow-y: auto;
+ font-family: "Lato", Helvetica, sans-serif;
.media-player {
width: 100%;
@@ -91,20 +93,48 @@ $header-inset: 10px;
}
.mo-meta-container {
- padding: 3*$header-inset;
- min-height: 100px;
- min-width: $panel-width;
- max-width: $panel-height;
display: flex;
- justify-content: center;
+ justify-content: center;
+ box-sizing: border-box;
+ min-height: 100px;
+ width: 100%;
+ padding: $padding;
.mo-box {
display: flex;
flex-direction: column;
- max-width: $panel-width - (6*$header-inset);
- min-width: $panel-width - (6*$header-inset);
- border: 1px solid rgb(189,189,189);
- padding: $header-inset;
+ max-width: $panel-width;
+ width: 100%;
+ padding: $padding 0;
+ border-top: 1px solid rgb(189,189,189);
+ font-family: "Lato", Helvetica, sans-serif;
+ font-size: $normal;
+
+ h4 {
+ margin: 0 0 5px 0;
+ text-transform: uppercase;
+ font-size: $xsmall;
+ color: $darkwhite;
+ font-weight: 100;
+ }
+
+ p {
+ margin-top: 0;
+ font-size: $large;
+ }
+
+ .material-icons {
+ font-size: $normal;
+ color: $darkwhite;
+ margin-right: 5px;
+ }
+
+ a {
+ font-size: $large;
+ color: $darkgrey;
+ border-bottom: 1px solid $red;
+ &:hover { border-bottom: 1px solid $darkgrey; }
+ }
}
.indent {
@@ -139,20 +169,24 @@ $header-inset: 10px;
/* source overlay specific styles */
.no-source-container {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
border: 1px solid black;
padding: 2em;
min-height: 200px;
}
.no-source-row {
- display: flex;
- justify-content: flex-start;
- margin-bottom: 0.7em;
- // min-width: 150px;
- // max-width: 150px;
- .no-source-icon {
- margin-right: 1em;
+ p {
+ text-align: center;
+ color: $midgrey;
+
+ .no-source-icon {
+ font-size: $xxxlarge;
+ color: $darkwhite;
+ }
}
}
diff --git a/src/scss/timeline.scss b/src/scss/timeline.scss
index 8e495b3..84432c0 100644
--- a/src/scss/timeline.scss
+++ b/src/scss/timeline.scss
@@ -7,12 +7,12 @@
background: rgba($black, 0.8);
box-shadow: 0 -10px 38px rgba(0, 0, 0, 0.3), 0 15px 12px rgba(0, 0, 0, 0.22);
color: white;
- transition: 0.2s ease;
+ transition: left 0.2s ease, bottom 0.2s ease;
bottom: 0px;
z-index: $timeline;
&.folded {
- transition: 0.2s ease;
+ transition: bottom 0.2s ease;
bottom: -170px;
.timeline-header .timeline-toggle p .arrow-down {
@@ -23,6 +23,7 @@
&.narrative-mode {
left: 0;
+ transition: left 0.2s ease;
}
.timeline-header {