jakrawal edits...

5 files changed, 27 insertions, 24 deletions

diff --git a/frontend/site/projects/museum/views/jakrawal.links.css b/frontend/site/projects/museum/views/jakrawal.links.css
index ca70885..d37c88d 100644
--- a/frontend/site/projects/museum/views/jakrawal.links.css
+++ b/frontend/site/projects/museum/views/jakrawal.links.css
@@ -48,6 +48,6 @@
 .jakrawal-text-icon {
   position: absolute;
   top: 1rem;
-  right: 1rem;
+  right: 1.5rem;
   cursor: url(/last-museum/static/uploads/3/cursor/The_Last_Museum_-_Symbols-103.png), pointer;
 }
diff --git a/frontend/site/projects/museum/views/jakrawal.links.js b/frontend/site/projects/museum/views/jakrawal.links.js
index 04eaf79..60ed64f 100644
--- a/frontend/site/projects/museum/views/jakrawal.links.js
+++ b/frontend/site/projects/museum/views/jakrawal.links.js
@@ -115,7 +115,7 @@ class JakrawalLinks extends Component {
       <div>
         {left && <div className="jakrawal-left" onClick={this.goLateral} />}
         {right && <div className="jakrawal-right" onClick={this.goLateral} />}
-        {text && <div className={hovering ? "jakrawal-text hovering" : "jakrawal-text"}>{text}</div>}
+        {text && <div className={hovering ? "jakrawal-text hovering" : "jakrawal-text"} dangerouslySetInnerHTML={{ __html: text }}></div>}
         {text && <div className="jakrawal-text-icon" onMouseEnter={this.handleEnter} onMouseLeave={this.handleLeave}><img src="/last-museum/static/uploads/3/cursor/The_Last_Museum_-_Symbols-103.png"/></div>}
       </div>
     )
diff --git a/frontend/site/projects/museum/views/titles.css b/frontend/site/projects/museum/views/titles.css
index a2f9868..547c9ba 100644
--- a/frontend/site/projects/museum/views/titles.css
+++ b/frontend/site/projects/museum/views/titles.css
@@ -21,7 +21,7 @@
 
   padding: 1rem;
   font-family: 'Helvetica', sans-serif;
-  font-size: 1.2rem;
+  font-size: 1.66vw;
   pointer-events: none;
   user-select: none;
 
@@ -31,13 +31,12 @@
 
 .charles-text {
   position: absolute;
-  top: 12vh;
+  top: 50%;
   left: 50%;
-  transform: translateX(-50%);
+  transform: translateX(-50%) translateY(-50%);
   width: 65vw;
-  font-size: 3.2vh;
-  font-weight: bold;
-  font-family: 'Helvetica', sans-serif;
+  font-family: "Druk Wide";
+  font-size: 1.66vw;
   color: #fff;
   text-shadow: 0px 2px 6px rgba(0,0,0,0.5);
   opacity: 0;
@@ -48,3 +47,6 @@
   opacity: 1;
   pointer-events: auto;
 }
+.charles-credit {
+  text-align: right;
+}
\ No newline at end of file
diff --git a/frontend/site/projects/museum/views/titles.overlay.js b/frontend/site/projects/museum/views/titles.overlay.js
index 373d031..12b8bae 100644
--- a/frontend/site/projects/museum/views/titles.overlay.js
+++ b/frontend/site/projects/museum/views/titles.overlay.js
@@ -138,7 +138,7 @@ class TitlesOverlay extends Component {
       <div>
         <div
           ref={this.headphonesRef}
-          className="headphones-title"
+          className="chapter-headphones"
         >
           {"Headphones recommended"}
         </div>
@@ -158,11 +158,9 @@ class TitlesOverlay extends Component {
         >
           {showText && (
             <span>
-              <i>{this.state.content.title}</i>
-              <br/><br/>
               {this.state.content.text}
               <br/><br/>
-              {this.state.content.credit}
+              <div className="charles-credit">{this.state.content.credit}</div>
             </span>
           )}
         </div>
diff --git a/frontend/site/viewer/viewer.container.js b/frontend/site/viewer/viewer.container.js
index 46ef0d0..1add4cf 100644
--- a/frontend/site/viewer/viewer.container.js
+++ b/frontend/site/viewer/viewer.container.js
@@ -114,28 +114,24 @@ class ViewerContainer extends Component {
   }
 
   handleMouseDown(e, tile) {
+    const popups = { ...this.props.popups }
+    let refreshPopups = false
     if (tile.href) {
       if (tile.href.indexOf('http') === 0) {
         window.location.href = tile.href
         return
       }
       else if (tile.href === '__open_popup') {
-        actions.site.setPopups({
-          ...this.props.popups,
-          [tile.settings.target_popup]: true,
-        })
+        popups[tile.settings.target_popup] = true
+        refreshPopups = true
       }
       else if (tile.href === '__close_popup') {
-        actions.site.setPopups({
-          ...this.props.popups,
-          [tile.settings.target_popup]: false,
-        })
+        popups[tile.settings.target_popup] = false
+        refreshPopups = true
       }
       else if (tile.href === '__toggle_popup') {
-        actions.site.setPopups({
-          ...this.props.popups,
-          [tile.settings.target_popup]: !this.props.popups[tile.settings.target_popup],
-        })
+        popups[tile.settings.target_popup] = !this.props.popups[tile.settings.target_popup]
+        refreshPopups = true
       }
       else if (!tile.settings.navigate_when_audio_finishes) {
         history.push(tile.href)
@@ -154,6 +150,13 @@ class ViewerContainer extends Component {
           [tile.id]: true,
         }
       })
+      if (tile.settings.show_popup_on_hover && tile.settings.on_hover_popup) {
+        popups[tile.settings.on_hover_popup] = false
+        refreshPopups = true
+      }
+    }
+    if (refreshPopups) {
+      actions.site.setPopups(popups)
     }
   }