jakrawal fix

8 files changed, 38 insertions, 30 deletions

diff --git a/frontend/site/projects/museum/views/artists.css b/frontend/site/projects/museum/views/artists.css
index 5a1cfaa..312407a 100644
--- a/frontend/site/projects/museum/views/artists.css
+++ b/frontend/site/projects/museum/views/artists.css
@@ -27,7 +27,7 @@
   transition: color 0.1s;
 }
 .page-artists .artist-big-name {
-  font-size: 15.5vh;
+  font-size: 17.4vh;
 }
 .page-artists .artist-big-name:hover {
   /*color: white;*/
@@ -84,6 +84,10 @@
   text-shadow: 0 0 5px #FF790D;
   cursor: pointer;
 }
+.page-artists .artist-detail-name,
+.page-artists .artist-detail-name:hover {
+  text-decoration: none;
+}
 .page-artists .nav-arrow {
   transform: translateZ(0);
 }
@@ -92,6 +96,18 @@
   fill: #FF790D;
 }
 
+.page-artists .artist-close {
+  position: fixed;
+  top: 0;
+  right: 0;
+  padding: 1rem 1.5rem;
+  cursor: pointer;
+  text-decoration: none;
+}
+.page-artists .artist-close img {
+  width: 2rem;
+}
+
 .page-artists .artist-content {
   position: absolute;
   top: 16vh; left: 0;
@@ -108,7 +124,8 @@
   padding-left: 2vw;
   padding-right: 2vw;
   width: 50vw;
-  font-size: 1.2vw;
+  font-size: 1.15vw;
+  text-shadow: 0 0 5px;
   line-height: 1.4;
 }
 .page-artists .artist-left p,
@@ -121,8 +138,6 @@
   left: 50vw;
   width: 50vw;
   height: 100vh;
-  font-size: 1.2vw;
-  line-height: 1.4;
   background: #222222;
   background-size: cover;
   background-position: center center;
diff --git a/frontend/site/projects/museum/views/artists.js b/frontend/site/projects/museum/views/artists.js
index c04b09f..fe07598 100644
--- a/frontend/site/projects/museum/views/artists.js
+++ b/frontend/site/projects/museum/views/artists.js
@@ -128,9 +128,10 @@ const ArtistDetail = ({ artist, index, isCurrent, language, onClose }) => {
         </div>
         <Link to={`/thelastmuseum/${artist.start}`} className="artist-right-inner" />
       </div>
-      <div className="artist-detail-name" onClick={onClose}>
-        {artist.name}
+      <div className="artist-detail-name">
+        <Link to={artist.homepage} target="_blank">{artist.name}</Link>
       </div>
+      <img src="/thelastmuseum/static/img/close-orange.png" onClick={onClose} className="artist-close" />
       <div className="artist-location">{artist.location[language]}</div>
     </div>
   )
diff --git a/frontend/site/projects/museum/views/counter.js b/frontend/site/projects/museum/views/counter.js
index 270e61f..9322bfa 100644
--- a/frontend/site/projects/museum/views/counter.js
+++ b/frontend/site/projects/museum/views/counter.js
@@ -1,5 +1,7 @@
 import React, { Component, createRef } from 'react'
 
+import { commatize } from "app/utils"
+
 import "./counter.css"
 
 export default class Counter extends Component {
@@ -47,22 +49,3 @@ function getPopulation() {
   return Math.round(population)
 }
 
-const commatize = (n, radix) => {
-  radix = radix || -1
-  var nums = [], i, counter = 0, r = Math.floor
-  if (radix !== -1 && n > radix) {
-    n /= radix
-    nums.unshift(r((n * 10) % 10))
-    nums.unshift(".")
-  }
-  do {
-    i = r(n % 10)
-    n = r(n / 10)
-    counter += 1
-    if (n && ! (counter % 3))
-      { i = ',' + r(i) }
-    nums.unshift(i)
-  }
-  while (n)
-  return nums.join("")
-}
diff --git a/frontend/site/projects/museum/views/credits.css b/frontend/site/projects/museum/views/credits.css
index b5609f0..6925ce7 100644
--- a/frontend/site/projects/museum/views/credits.css
+++ b/frontend/site/projects/museum/views/credits.css
@@ -23,7 +23,7 @@
   text-transform: uppercase;
   font-size: 14vw;
   text-align: center;
-  line-height: 1;
+  line-height: 0.8;
   white-space: nowrap;
   cursor: default;
 }
diff --git a/frontend/site/projects/museum/views/essay.css b/frontend/site/projects/museum/views/essay.css
index a3cae05..009e217 100644
--- a/frontend/site/projects/museum/views/essay.css
+++ b/frontend/site/projects/museum/views/essay.css
@@ -47,7 +47,7 @@
   font-size: 10vw;
 }
 .page-essay .page-subtitle {
-  margin: 0rem 0 2vw 0;
+  margin: 1rem 0 1rem 0;
 }
 .page-essay p {
   margin: 0 0 2vw 0;
@@ -55,7 +55,8 @@
   line-height: 1.4;
 }
 
-.page-essay.page-artists .artist-detail.visible {
+.page-essay.page-artists .artist-detail {
+  padding-top: 20px;
   background: rgb(255, 121, 13);
   color: #000;
 }
diff --git a/frontend/site/projects/museum/views/essay.js b/frontend/site/projects/museum/views/essay.js
index 6947ed5..90439fe 100644
--- a/frontend/site/projects/museum/views/essay.js
+++ b/frontend/site/projects/museum/views/essay.js
@@ -137,7 +137,6 @@ const EssayDetail = props => {
 const ArtistStatements = ({ essayId, index, isCurrent, language, onClose }) => (
   <div className={isCurrent ? "artist-detail visible" : "artist-detail"}>
     <div className="page-title" onClick={onClose}>ARTIST STATEMENTS</div>
-    <br /><br />
     {ARTIST_ORDER.map((key, index) => {
       const artist = ARTISTS[key]
       return (
diff --git a/frontend/site/projects/museum/views/jakrawal.links.js b/frontend/site/projects/museum/views/jakrawal.links.js
index e66f057..90c4871 100644
--- a/frontend/site/projects/museum/views/jakrawal.links.js
+++ b/frontend/site/projects/museum/views/jakrawal.links.js
@@ -114,6 +114,7 @@ class JakrawalLinks extends Component {
     history.push(`/thelastmuseum/nilthamrong-${this.state.lateralLink}/`)
   }
   goVertical() {
+    this.setState({ vertical: false })
     history.push(`/thelastmuseum/nilthamrong-${this.state.verticalLink}/`)
   }
 
diff --git a/frontend/site/projects/museum/views/nav.overlay.js b/frontend/site/projects/museum/views/nav.overlay.js
index 02945c6..f8c2923 100644
--- a/frontend/site/projects/museum/views/nav.overlay.js
+++ b/frontend/site/projects/museum/views/nav.overlay.js
@@ -244,7 +244,7 @@ class NavOverlay extends Component {
           )}
         </div>
         {showClose && (
-          <a href={`https://www.kw-berlin.de/${language}/`} className={orangeClose ? "close-orange site-close" : "site-close"}>
+          <a href={exitLink(language)} className={orangeClose ? "close-orange site-close" : "site-close"}>
             <span>{BACK_TO_KW[language]}</span>
             <img src={orangeClose ? "/thelastmuseum/static/img/close-orange.png" : "/thelastmuseum/static/img/close.png"} />
           </a>
@@ -256,6 +256,14 @@ class NavOverlay extends Component {
   }
 }
 
+function exitLink(language) {
+  let link = 'https://www.kw-berlin.de/home/'
+  if (language === 'en') {
+    link += 'en/'
+  }
+  return link
+}
+
 const mapStateToProps = state => ({
   language: state.site.language,
 })