nora texts

5 files changed, 24 insertions, 102 deletions

diff --git a/frontend/site/projects/museum/stl-files.js b/frontend/site/projects/museum/stl-files.js
index 146e135..a9483d7 100644
--- a/frontend/site/projects/museum/stl-files.js
+++ b/frontend/site/projects/museum/stl-files.js
@@ -4,8 +4,8 @@ export const STL_FILES = {
     url: "/last-museum/static/media/last-museum/nora-albadri/nefertiti.stl",
     modelMaterial: { 
       color: "#bbbbff", 
-      metalness: 0.8,
-      roughness: 0.4,
+      metalness: 0.7,
+      roughness: 0.5,
     },
     width: () => window.innerWidth / 2,
     height: () => window.innerHeight * 2/3,
@@ -25,9 +25,9 @@ export const STL_FILES = {
   "nora-horus-2": {
     url: "/last-museum/static/media/last-museum/nora-albadri/shehorus.stl",
     modelMaterial: { 
-      color: "#888888", 
-      metalness: 0.8,
-      roughness: 0.4,
+      color: "#dddddd", 
+      metalness: 0.9,
+      roughness: 0.7,
     },
     width: () => window.innerWidth * 0.25,
     height: () => window.innerHeight * 2/3,
@@ -48,8 +48,8 @@ export const STL_FILES = {
     url: "/last-museum/static/media/last-museum/nora-albadri/peg.stl",
     modelMaterial: { 
       color: "#0000ff", 
-      metalness: 0.8,
-      roughness: 0.4,
+      metalness: 0.9,
+      roughness: 0.7,
     },
     width: () => window.innerWidth / 2,
     height: () => window.innerHeight * 2/3,
@@ -70,9 +70,9 @@ export const STL_FILES = {
   "nora-lamassu-2": {
     url: "/last-museum/static/media/last-museum/nora-albadri/lamassu.stl",
     modelMaterial: { 
-      color: "#bfb8a8", 
-      metalness: 0.8,
-      roughness: 0.4,
+      color: "#efe8f8", 
+      metalness: 0.5,
+      roughness: 0.5,
     },
     width: () => window.innerWidth * 1/2,
     height: () => window.innerHeight * 2/3,
@@ -94,8 +94,8 @@ export const STL_FILES = {
     url: "/last-museum/static/media/last-museum/nora-albadri/queen.stl",
     modelMaterial: { 
       color: "#BCC6CC", 
-      metalness: 0.8,
-      roughness: 0.4,
+      metalness: 0.7,
+      roughness: 0.6,
     },
     width: () => window.innerWidth / 2,
     height: () => window.innerHeight * 2/3,
diff --git a/frontend/site/projects/museum/text-overlays.js b/frontend/site/projects/museum/text-overlays.js
index 401ab4e..50991dd 100644
--- a/frontend/site/projects/museum/text-overlays.js
+++ b/frontend/site/projects/museum/text-overlays.js
@@ -5,20 +5,6 @@ export const TEXT_OVERLAYS = {
   /* nora al-badri */
 
   'nora-2': {
-    style: {
-      top: "1rem",
-      right: "2rem",
-      transform: "scale(0.7)",
-    },
-    textStyle: {
-      right: "0",
-      width: "100vw",
-      left: "0",
-      top: "4rem",
-      color: "#FF790D",
-      fontFamily: '"Druk Wide"',
-      fontSize: "2vw",
-    },
     text: `
       <h2>AFU. This is not a hackerspace.</h2>
       <p>
@@ -39,20 +25,6 @@ export const TEXT_OVERLAYS = {
     `
   },
   'nora-nefertiti': {
-    style: {
-      top: "1rem",
-      right: "2rem",
-      transform: "scale(0.7)",
-    },
-    textStyle: {
-      right: "0",
-      width: "100vw",
-      left: "0",
-      top: "4rem",
-      color: "#FF790D",
-      fontFamily: '"Druk Wide"',
-      fontSize: "2vw",
-    },
     text: `
       <h2>Nature/Nefertiti</h2>
       <p>
@@ -62,20 +34,6 @@ export const TEXT_OVERLAYS = {
   },
 
   'nora-horus-2': {
-    style: {
-      top: "1rem",
-      right: "2rem",
-      transform: "scale(0.7)",
-    },
-    textStyle: {
-      right: "0",
-      width: "100vw",
-      left: "0",
-      top: "4rem",
-      color: "#FF790D",
-      fontFamily: '"Druk Wide"',
-      fontSize: "2vw",
-    },
     text: `
       <h2>Horus/Her</h2>
       <p>
@@ -84,20 +42,6 @@ export const TEXT_OVERLAYS = {
     `
   },
   'nora-peg-stairs-close': {
-    style: {
-      top: "1rem",
-      right: "2rem",
-      transform: "scale(0.7)",
-    },
-    textStyle: {
-      right: "0",
-      width: "100vw",
-      left: "0",
-      top: "4rem",
-      color: "#FF790D",
-      fontFamily: '"Druk Wide"',
-      fontSize: "2vw",
-    },
     text: `
       <h2>Foundation Peg/Nin</h2>
       <p>
@@ -106,20 +50,6 @@ export const TEXT_OVERLAYS = {
     `
   },
   'nora-lamassu-2': {
-    style: {
-      top: "1rem",
-      right: "2rem",
-      transform: "scale(0.7)",
-    },
-    textStyle: {
-      right: "0",
-      width: "100vw",
-      left: "0",
-      top: "4rem",
-      color: "#FF790D",
-      fontFamily: '"Druk Wide"',
-      fontSize: "2vw",
-    },
     text: `
       <h2>Lamma</h2>
       <p>
@@ -128,20 +58,6 @@ export const TEXT_OVERLAYS = {
     `
   },
   'nora-queen-of-night': {
-    style: {
-      top: "1rem",
-      right: "2rem",
-      transform: "scale(0.7)",
-    },
-    textStyle: {
-      right: "0",
-      width: "100vw",
-      left: "0",
-      top: "4rem",
-      color: "#FF790D",
-      fontFamily: '"Druk Wide"',
-      fontSize: "2vw",
-    },
     text: `
       <h2>Queen of the Hacker Night</h2>
       <p>
diff --git a/frontend/site/projects/museum/views/subtitles.overlay.js b/frontend/site/projects/museum/views/subtitles.overlay.js
index b34b5ef..c31a2fd 100644
--- a/frontend/site/projects/museum/views/subtitles.overlay.js
+++ b/frontend/site/projects/museum/views/subtitles.overlay.js
@@ -31,7 +31,6 @@ class SubtitlesOverlay extends Component {
   }
 
   componentDidUpdate(prevProps) {
-    console.log((this.props.interactive && this.props.interactive !== prevProps.interactive), this.props.location.pathname !== prevProps.location.pathname)
     if (
       (this.props.interactive && this.props.interactive !== prevProps.interactive)
       || this.props.location.pathname !== prevProps.location.pathname
diff --git a/frontend/site/projects/museum/views/overlay.css b/frontend/site/projects/museum/views/text.overlay.css
index 48e8480..53f9813 100644
--- a/frontend/site/projects/museum/views/overlay.css
+++ b/frontend/site/projects/museum/views/text.overlay.css
@@ -1,15 +1,23 @@
 
 .text-overlay-icon {
   position: fixed;
+  top: 1rem;
+  right: 2rem;
+  transform: scale(0.7);
   cursor: pointer;
 }
 .text-overlay {
   position: fixed;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+  color: #FF790D;
+  font-family: "Druk Wide", sans-serif;
+  font-size: 2vw;
   padding: 1rem;
   font-size: 1rem;
-  font-family: 'Helvetica', sans-serif;
   cursor: url(/last-museum/static/uploads/3/cursor/The_Last_Museum_-_Symbols-72.png) 50 50, pointer;
-  color: #000;
 }
 .text-overlay::-webkit-scrollbar {
   background: transparent;
@@ -24,5 +32,5 @@
 }
 .text-overlay h2 {
   font-family: 'Druk Wide', sans-serif;
-  font-size: 22px;
+  font-size: 3vw;
 }
diff --git a/frontend/site/projects/museum/views/text.overlay.js b/frontend/site/projects/museum/views/text.overlay.js
index fb634e2..3584fa3 100644
--- a/frontend/site/projects/museum/views/text.overlay.js
+++ b/frontend/site/projects/museum/views/text.overlay.js
@@ -3,7 +3,7 @@ import { connect } from 'react-redux'
 
 import { TEXT_OVERLAYS, DEFAULT_CLOSED_ICON, DEFAULT_ICON } from '../text-overlays.js'
 
-import './overlay.css'
+import './text.overlay.css'
 
 class TextOverlay extends Component {
   state = {
@@ -81,7 +81,6 @@ class TextOverlay extends Component {
       <div
         className="text-overlay"
         style={{
-          ...content.style,
           ...(content.textStyle || {}),
         }}
         onClick={this.toggle}