From ed6fd8d909b4b44c37568d755229539dc51855fc Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 20 Apr 2021 00:53:19 +0200 Subject: add artist images --- frontend/site/projects/museum/views/artists.css | 16 +++++++++++----- frontend/site/projects/museum/views/artists.js | 3 ++- frontend/site/projects/museum/views/home.css | 1 + frontend/site/projects/museum/views/titles.overlay.js | 3 +-- 4 files changed, 15 insertions(+), 8 deletions(-) (limited to 'frontend/site/projects/museum/views') diff --git a/frontend/site/projects/museum/views/artists.css b/frontend/site/projects/museum/views/artists.css index a327e19..5a1cfaa 100644 --- a/frontend/site/projects/museum/views/artists.css +++ b/frontend/site/projects/museum/views/artists.css @@ -119,14 +119,20 @@ position: absolute; top: 0; left: 50vw; - padding-top: 2vh; - padding-bottom: 4vh; - padding-left: 2vw; - padding-right: 2vw; width: 50vw; + height: 100vh; font-size: 1.2vw; line-height: 1.4; - /*background: #222222;*/ + background: #222222; + background-size: cover; + background-position: center center; +} +.page-artists .artist-right-inner { + position: absolute; + top: 0; + left: 50vw; + width: 50vw; + height: 100%; } .page-artists .artist-location { position: absolute; diff --git a/frontend/site/projects/museum/views/artists.js b/frontend/site/projects/museum/views/artists.js index ed6ba0d..daa46f5 100644 --- a/frontend/site/projects/museum/views/artists.js +++ b/frontend/site/projects/museum/views/artists.js @@ -1,4 +1,5 @@ import React, { Component } from 'react' +import { Link } from 'react-router-dom' import { connect } from 'react-redux' import actions from 'site/actions' @@ -125,7 +126,7 @@ const ArtistDetail = ({ artist, index, isCurrent, language, onClose }) => {
-
+
{artist.name} diff --git a/frontend/site/projects/museum/views/home.css b/frontend/site/projects/museum/views/home.css index c8a55c9..1820524 100644 --- a/frontend/site/projects/museum/views/home.css +++ b/frontend/site/projects/museum/views/home.css @@ -157,4 +157,5 @@ html { } .curtain.hidden { opacity: 0; + pointer-events: none; } \ 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 c5421ea..2b0ba7e 100644 --- a/frontend/site/projects/museum/views/titles.overlay.js +++ b/frontend/site/projects/museum/views/titles.overlay.js @@ -147,9 +147,8 @@ class TitlesOverlay extends Component { render() { const { content, showText } = this.state - const { popups, interactive } = this.props + const { popups, interactive, language } = this.props if (!interactive || !content) return null - console.log(content) return (