Merge pull request #83 from forensic-architecture/source-overlay-refine

Source overlay refine

src/components/SourceOverlay.jsx

@@ -130,8 +130,8 @@ function SourceOverlay ({ source, onCancel }) {
 
 
   return (
-    <div className="mo-overlay">
-      <div className="mo-container">
+    <div className="mo-overlay" onClick={onCancel}>
+      <div className="mo-container" onClick={(e) => { e.stopPropagation(); }}>
         <div className="mo-header">
           <div className="mo-header-close" onClick={onCancel}>
             <button className="side-menu-burg is-active"><span></span></button>
@@ -143,12 +143,15 @@ function SourceOverlay ({ source, onCancel }) {
         </div>
         <div className="mo-meta-container">
           <div className="mo-box">
-            {title? <div><b>{title}</b></div> : null}
+            {title? <p><b>{title}</b></p> : null}
             <div>{_renderCounts(counts)}</div>
-            {type ? <div>{type}</div> : null}
-            {date ? <div>Date:<span className="indent">{date}</span></div> : null}
-            {url ? <div><a href={url} target="_blank">Link to original URL</a></div> : null}
-            <hr />
+            {type ? <h4>Media type</h4> : null}
+            {type ? <p><i className="material-icons left">perm_media</i>{type}</p> : null}
+            {date ? <h4>Date</h4> : null}
+            {date ? <p><i className="material-icons left">today</i>{date}</p>: null}
+            {url ? <h4>Link</h4> : null}
+            {url ? <span><i className="material-icons left">link</i><a href={url} target="_blank">Link to original URL</a></span> : null}
+            {desc ? <hr /> : null}
             {desc ? <div>{desc}</div> : null}
           </div>
         </div>

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 });
+    });
 
   }
 

src/components/presentational/NoSource.js

@@ -4,10 +4,10 @@ const NoSource = ({ failedUrls  }) => {
   return (
     <div className="no-source-container">
       <div className="no-source-row">
-        <i className="material-icons no-source-icon">
-          error
-        </i>
-        <div>No media found, as the original media has not yet been uploaded to the platform.</div>
+        <p>
+          <i className="material-icons no-source-icon">error</i>
+        </p>          
+        <p>No media found, as the original media has not yet been uploaded to the platform.</p>
       </div>
     </div>
   )

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(''),

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;
+    }
   }
 }
 

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 {