summaryrefslogtreecommitdiff
path: root/frontend/site/projects/museum/views
diff options
context:
space:
mode:
Diffstat (limited to 'frontend/site/projects/museum/views')
-rw-r--r--frontend/site/projects/museum/views/nav.css3
-rw-r--r--frontend/site/projects/museum/views/overlay.css13
-rw-r--r--frontend/site/projects/museum/views/text.overlay.js12
3 files changed, 18 insertions, 10 deletions
diff --git a/frontend/site/projects/museum/views/nav.css b/frontend/site/projects/museum/views/nav.css
index cb21046..27b9190 100644
--- a/frontend/site/projects/museum/views/nav.css
+++ b/frontend/site/projects/museum/views/nav.css
@@ -51,6 +51,9 @@
stroke: rgba(255, 121, 13, 1.0);
stroke-width: 2px;
}
+.nav-arrow:hover path {
+ stroke: rgba(255, 255, 255, 1.0);
+}
.nav-arrow.arrow-left {
left: 0;
}
diff --git a/frontend/site/projects/museum/views/overlay.css b/frontend/site/projects/museum/views/overlay.css
index 1a00b95..6483b28 100644
--- a/frontend/site/projects/museum/views/overlay.css
+++ b/frontend/site/projects/museum/views/overlay.css
@@ -5,16 +5,11 @@
}
.text-overlay {
position: fixed;
- background: black;
- border: 2px solid;
padding: 1rem;
font-size: 1rem;
font-family: 'Helvetica', sans-serif;
cursor: url(/last-museum/static/uploads/3/cursor/The_Last_Museum_-_Symbols-33.png) 50 50, pointer;
- color: #FF790D;
- max-width: 400px;
- max-height: 400px;
- overflow: auto;
+ color: #000;
}
.text-overlay::-webkit-scrollbar {
background: transparent;
@@ -25,5 +20,9 @@
}
.text-overlay p {
margin: 0 0 1rem 0;
- line-height: 1.3;
+ line-height: 1.7;
+}
+.text-overlay h2 {
+ font-family: 'Druk Wide', sans-serif;
+ font-size: 22px;
}
diff --git a/frontend/site/projects/museum/views/text.overlay.js b/frontend/site/projects/museum/views/text.overlay.js
index 65fc3b2..9627901 100644
--- a/frontend/site/projects/museum/views/text.overlay.js
+++ b/frontend/site/projects/museum/views/text.overlay.js
@@ -48,8 +48,10 @@ class TextOverlay extends Component {
render() {
const { open, content } = this.state
- if (!this.props.interactive || !content) return null
- if (!open) {
+ const { popups, interactive } = this.props
+ if (!interactive || !content) return null
+ if (content.popup && !popups[content.popup]) return null
+ if (!content.popup && !open) {
return (
<div
className="text-overlay-icon"
@@ -64,7 +66,10 @@ class TextOverlay extends Component {
return (
<div
className="text-overlay"
- style={content.style}
+ style={{
+ ...content.style,
+ ...(content.textStyle || {}),
+ }}
onClick={this.toggle}
dangerouslySetInnerHTML={{ __html: content.text }}
/>
@@ -73,6 +78,7 @@ class TextOverlay extends Component {
}
const mapStateToProps = state => ({
+ popups: state.site.popups,
interactive: state.site.interactive,
})