summaryrefslogtreecommitdiff
path: root/frontend/site/projects/museum/views
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2021-04-15 00:01:42 +0200
committerJules Laplace <julescarbon@gmail.com>2021-04-15 00:01:42 +0200
commitced3d7e5b1a428017a1ef69beffb5dcffcc3c88e (patch)
tree393f280322f934f600830f10db9770186ea84e64 /frontend/site/projects/museum/views
parent186b657e61d235c111cb2a5021b3a9dbd138d3ca (diff)
nora texts
Diffstat (limited to 'frontend/site/projects/museum/views')
-rw-r--r--frontend/site/projects/museum/views/subtitles.overlay.js1
-rw-r--r--frontend/site/projects/museum/views/text.overlay.css (renamed from frontend/site/projects/museum/views/overlay.css)14
-rw-r--r--frontend/site/projects/museum/views/text.overlay.js3
3 files changed, 12 insertions, 6 deletions
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}