summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2021-04-28 22:49:17 +0200
committerJules Laplace <julescarbon@gmail.com>2021-04-28 22:49:17 +0200
commit938545387a234b2cd34bd5f52e0efe5fdd1b71c0 (patch)
tree7c24b838795b2e4cca6b3021e26c6bcd53a0b7f8
parentcae0d53e2dab523327f93a0a6df277789543c6fd (diff)
jakrawal fix
-rw-r--r--frontend/app/utils/index.js20
-rw-r--r--frontend/site/projects/museum/constants.js35
-rw-r--r--frontend/site/projects/museum/views/artists.css23
-rw-r--r--frontend/site/projects/museum/views/artists.js5
-rw-r--r--frontend/site/projects/museum/views/counter.js21
-rw-r--r--frontend/site/projects/museum/views/credits.css2
-rw-r--r--frontend/site/projects/museum/views/essay.css5
-rw-r--r--frontend/site/projects/museum/views/essay.js1
-rw-r--r--frontend/site/projects/museum/views/jakrawal.links.js1
-rw-r--r--frontend/site/projects/museum/views/nav.overlay.js10
10 files changed, 63 insertions, 60 deletions
diff --git a/frontend/app/utils/index.js b/frontend/app/utils/index.js
index d67d89a..b8a2ed7 100644
--- a/frontend/app/utils/index.js
+++ b/frontend/app/utils/index.js
@@ -54,6 +54,26 @@ export const capitalize = s => s.split(' ').map(capitalizeWord).join(' ')
export const capitalizeWord = s => s.substr(0, 1).toUpperCase() + s.substr(1)
export const padSeconds = n => n < 10 ? '0' + n : n
+export 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("")
+}
+
export const timestamp = (n = 0, fps = 25) => {
n /= fps
let s = padSeconds(Math.round(n) % 60)
diff --git a/frontend/site/projects/museum/constants.js b/frontend/site/projects/museum/constants.js
index 4260e3b..aca9ef1 100644
--- a/frontend/site/projects/museum/constants.js
+++ b/frontend/site/projects/museum/constants.js
@@ -6,20 +6,15 @@ export const ARTISTS = {
de: "CCCB and c-base, Berlin, Deutschland",
},
start: "nora-1",
+ homepage: "https://www.nora-al-badri.de",
bio: {
en: `
<p>
- <a href="https://www.nora-al-badri.de" target="_blank">www.nora-al-badri.de</a>
- </p>
- <p>
Nora Al-Badri is a multi-disciplinary and conceptual media artist with a German-Iraqi background. She graduated in political sciences at Johann Wolfgang Goethe University in Frankfurt/Main and is currently the first artist-in-residence at the Swiss Federal Institute for Technology (EPFL) and its Laboratory for Experimental Museology (eM+). Her practice focuses on the politics and the emancipatory potential of new technologies such as machine intelligence or data sculpting, non-human agency and transcendence. She has exhibited in the Viktoria and Albert Museums' Applied Arts Pavilion at La Biennale di Venezia, 3rd Design Biennal Istanbul, ZKM Karlsruhe, Science Gallery, Dublin. Berliner Herbstsalon - Gorki Theater, Ars Electronica, Abandon Normal Devices, The Influencers, etc. Al-Badri regularly gives classes and lectures at universities and museums all over the world such as Techne Institute at University of Buffalo, MassArt Boston, UDK university Berlin, Hochschule Weißensee Berlin, KTH Royal Institute of Technology Stockholm, University of Halle and IRIBA Center for Multimedia Heritage and different Kigali, Warburg Institute and Central Saint Martins College London, UCL London, Einstein Center for Digital Future Berlin. Haus der elektronischen Künste Basel, Mozilla Festival and many more. She is acting as jury member for the Chaos Communication Congress' Arts & Culture Track, the jury of Berlinale Peace Price from Heinrich Böll Foundation (2019) and the jury of the Digital Academy Dortmund (2019).
</p>
`,
de: `
<p>
- <a href="https://www.nora-al-badri.de" target="_blank">www.nora-al-badri.de</a>
- </p>
- <p>
Nora Al-Badri ist eine multidisziplinäre und konzeptuelle Medienkünstlerin mit deutsch-irakischer Herkunft. Sie schloss ihr Studium der Politikwissenschaften an der Johann Wolfgang Goethe-Universität in Frankfurt am Main ab und ist derzeit die erste Artist-in-Residence an der Eidgenössischen Technischen Hochschule Lausanne (EPFL) und deren Labor für experimentelle Museologie (eM+). Ihre Praxis befasst sich mit der Politik und dem emanzipatorischen Potenzial neuer Technologien wie Maschinenintelligenz oder ‘data sculpting‘, nicht menschlicher Handlungsmacht und Transzendenz. Sie stellte ihre Arbeiten bereits im Viktoria and Albert Museums' Applied Arts Pavillon auf La Biennale di Venezia, auf der 3. Design Biennale Istanbul, im ZKM Karlsruhe, Science Gallery, Dublin, dem Berliner Herbstsalon - Gorki Theater, Ars Electronica, Abandon Normal Devices, bei The Influencers und vielen mehr aus. Al-Badri gibt regelmäßig Kurse und hält Vorträge an Universitäten und Museen auf der ganzen Welt, darunter am Techne Institute der University of Buffalo, MassArt Boston, an der UDK Universität Berlin, Hochschule Weißensee Berlin, KTH Royal Institute of Technology Stockholm, Universität Halle und am IRIBA Center for Multimedia Heritage, Kigali, Warburg Institute und Central Saint Martins College London, UCL London, Einstein Center for Digital Future Berlin, Haus der elektronischen Künste Basel, Mozilla Festival und vielen weiteren. Sie ist sowohl Mitglied in der Jury des Chaos Communication Congress' Arts & Culture Track als auch des Berlinale Friedensfilmpreises der Heinrich-Böll-Stiftung (2019) und der Digitalen Akademie Dortmund (2019).
</p>
`,
@@ -79,20 +74,15 @@ export const ARTISTS = {
de: "Santa Ifigênia, São Paulo, Brasilien",
},
start: "leite-chapter-1",
+ homepage: "https://www.julianacerqueiraleite.com",
bio: {
en: `
<p>
- <a href="https://www.julianacerqueiraleite.com" target="_blank">www.julianacerqueiraleite.com</a>
- </p>
- <p>
Juliana Cerqueira Leite (b. 1981) is a Brazilian/American sculptor based in New York and São Paolo. Cerqueira Leite received the 2019 Pollock-Krasner Foundation Grant for her exhibition Orogenesis at the National Archaeological Museum in Naples, Italy. She was awarded the 2016 Furla Art Prize for her contribution to the 5th Moscow Young Art Biennale. She has exhibited her work in sculpture, drawing, photography and video internationally in solo shows in venues including Instituto Tomie Ohtake in São Paulo, Arsenal Contemporary in New York and Montreal, Galeria Casa Triângulo in São Paolo, Alma Zevi gallery in Venice, Galleria Lorcan O’Neill in Rome, TJ Boulting in London and Regina Rex Gallery in New York. She has also exhibited her work in group shows and biennials including Hordaland Kunstsenter for Bergen Assembly, Sculpture Center in New York, Ilmin Museum in Seoul, Marres House for Contemporary Culture in Maastricht, and Saatchi Gallery in London. Her work has been commissioned by international Biennials and Triennials including The Antarctic Pavilion of the 2017 Venice Biennale, Bergen Assembly 2019, Moscow Young Art Biennale, Marrakech Biennale and the 2014 Vancouver Sculpture Biennial. Cerqueira Leite graduated from the Slade School of Fine Art (UCL) Graduate Sculpture program in 2006, London, as the inaugural recipient of the Kenneth Armitage Sculpture Prize.
</p>
`,
de: `
<p>
- <a href="https://www.julianacerqueiraleite.com" target="_blank">www.julianacerqueiraleite.com</a>
- </p>
- <p>
Juliana Cerqueira Leite (*1981) ist eine brasilianisch-amerikanische Bildhauerin, die in New York und São Paulo lebt und arbeitet. Cerqueira Leite erhielt 2019 den Pollock-Krasner Foundation Grant für ihre Ausstellung Orogenesis im Archäologischen Nationalmuseum in Neapel, Italien. Sie wurde 2016 mit dem Furla Art Prize für ihren Beitrag zur 5. Moskau Young Art Biennale ausgezeichnet. Ihre Arbeiten in den Bereichen Skulptur, Zeichnung, Fotografie und Video wurden international in Einzelausstellungen gezeigt, unter anderem im Instituto Tomie Ohtake in São Paulo, Arsenal Contemporary in New York und Montreal, in der Galeria Casa Triângulo in São Paulo, Alma Zevi gallery in Venedig, Galleria Lorcan O’Neill in Rom, TJ Boulting in London sowie in der Regina Rex Gallery in New York. Darüber hinaus waren Cerqueira Leites Arbeiten in zahlreichen Gruppenausstellungen und Biennalen zu sehen, darunter im Hordaland Kunstsenter for Bergen Assembly, Sculpture Center in New York, Ilmin Museum in Seoul, Marres House for Contemporary Culture in Maastricht und in der Saatchi Gallery in London. Ihre Arbeiten wurden von internationalen Biennalen und Triennalen in Auftrag gegeben, unter anderem vom Antarctic Pavillon der Venedig Biennale 2017, Bergen Assembly 2019, von der Moskau Young Art Biennale, Marrakech Biennale sowie der Vancouver Sculpture Biennale 2014. Cerqueira Leite absolvierte 2006 das Slade School of Fine Art (UCL) Graduate Sculpture program in London als erste Preisträgerin des Kenneth Armitage Sculpture Prize.
</p>
`,
@@ -152,20 +142,15 @@ export const ARTISTS = {
de: "Urumbilum River, Gumbaynggirr Country, Australien",
},
start: "foreshew-1",
+ homepage: "https://www.nicoleforeshew.com",
bio: {
en: `
<p>
- <a href="https://www.nicoleforeshew.com" target="_blank">www.nicoleforeshew.com</a>
- </p>
- <p>
Nicole Foreshew (b. 1982) lives and works Urunga, New South Wales, Wiradjuri Nation. Nicole Foreshew is a Wiradjuri artist, writer and curator. Her practice incorporates mediums including photography, video and sculpture through which she maintains an ongoing thematic exploration of her heritage through contemporary and innovative frameworks. Foreshew has exhibited widely in Australia and internationally, including Primavera 2017: Young Australian Artists, MCA (2017); Mulunma (Within, Inside), Manly Art Gallery and Museum (2016); Old Land New Marks, Dubbo Regional Gallery (2016); Sixth Sense, National Art School Gallery, National Art School, Sydney (2016); Shimmer, Tarnanthi, Festival of Contemporary Aboriginal and Torres Strait Islander Art, Adelaide, South Australia (2015); Wiradjuri Ngurambanggu, Murray Art Museum Albury (2015); Hereby Make Protest, Carriageworks, Sydney (2014); Shadowlife, Bendigo Art Gallery (2013); Born in Darkness Before Dawn, a major public artwork commission for Place Projections, Eora Journey, a City of Sydney arts initiative, (2013) and Maamungun Compatriots, Lalit Kala Akademi, New Delhi, India (2012). Foreshew is the recipient of a number of public commissions, including Wynscreen, Transport for NSW, Wynyard Walk, Sydney (2017) and Eora Journey, City of Sydney (2014). In 2014 she was awarded a NSW Aboriginal Art Fellowship from Arts NSW to undertake her work titled Grounded: Earth’s materials, processes and structures, which won the prestigious NSW Aboriginal Parliamentary Prize. In 2015 Foreshew was Curatorial Fellow at the Museum of Contemporary Art Australia, and guest curator for Primavera 2015, the MCA’s annual exhibition of young Australian artists aged 35 and under. Her works are held in a number of state and regional galleries across Australia including the Murray Art Museum, Albury, Museum of Contemporary Art Australia, Sydney and National Gallery of Australia, Canberra.
</p>
`,
de: `
<p>
- <a href="https://www.nicoleforeshew.com" target="_blank">www.nicoleforeshew.com</a>
- </p>
- <p>
Nicole Foreshew (*1982) lebt und arbeitet in Urunga, New South Wales, Wiradjuri Nation. Nicole Foreshew ist eine Wiradjuri Künstlerin, Autorin und Kuratorin. Ihre Praxis umfasst Medien wie Fotografie, Video und Skulptur, anhand derer sie eine fortlaufende thematische Auseinandersetzung mit ihrem kulturellen Erbe durch einen zeitgenössischen und innovativen Ansatz schafft. Foreshews Arbeiten wurden in zahlreichen Ausstellungen in Australien und international gezeigt, darunter Primavera 2017: Young Australian Artists, MCA (2017); Mulunma (Within, Inside), Manly Art Gallery und Museum (2016); Old Land New Marks, Dubbo Regional Gallery (2016); Sixth Sense, National Art School Gallery, National Art School, Sydney (2016); Shimmer, Tarnanthi, Festival of Contemporary Aboriginal and Torres Strait Islander Art, Adelaide, South Australia (2015); Wiradjuri Ngurambanggu, Murray Art Museum Albury (2015); Hereby Make Protest, Carriageworks, Sydney (2014); Shadowlife, Bendigo Art Gallery (2013); Born in Darkness Before Dawn, eine umfangreiche Auftragsarbeit für Place Projections, Eora Journey, eine Kunstinitiative der Stadt Sdney, (2013), sowie Maamungun Compatriots, Lalit Kala Akademi, Neu Delhi, Indien (2012). Foreshew hat eine Reihe von Auftragsarbeiten für den öffentlichen Raum realisiert, darunter Wynscreen, Transport für NSW, Wynyard Walk, Sydney (2017) und Eora Journey, City of Sydney (2014). Im Jahr 2014 erhielt sie das NSW Aboriginal Art Stipendium von Arts NSW für Ihre Arbeit Grounded: Earth’s materials, processes and structures, die den renommierten NSW Aboriginal Parliamentary Prize gewonnen hat. 2015 war Foreshew Curatorial Fellow im Museum of Contemporary Art Australien und Gastkuratorin für Primavera 2015, der jährlichen Ausstellung junger australischer Künstler*innen unter 35 Jahren des MCA’s. Ihre Arbeiten befinden sich in einer Reihe von staatlichen und regionalen Galerien in Australien, einschließlich des Murray Art Museum, Albury, Museum of Contemporary Art Australia, Sydney sowie der National Gallery von Australien, Canberra.
</p>
`,
@@ -207,20 +192,15 @@ export const ARTISTS = {
de: "Cosmic Ray Research Station, Kanadische Rockies (Wintersonnenwende)",
},
start: "stankievech-1",
+ homepage: "https://www.stankievech.net/",
bio: {
en: `
<p>
- <a href="https://www.stankievech.net/" target="_blank">www.stankievech.net</a>
- </p>
- <p>
Charles Stankievech (b. 1978, Canada) is an artist whose research has explored the notion of “fieldwork” in the embedded landscape, the military industrial complex, and geopolitics. His diverse body of work has been shown internationally at institutions including the Louisiana Museum of Modern Art, Copenhagen; Palais de Tokyo, Paris; Haus der Kulturen der Welt, Berlin; National Gallery of Canada, Ottawa; Thyssen-Bornemisza Art Contemporary, Vienna; MASS MoCA; Musée d’art contemporain de Montréal; Canadian Centre for Architecture, Montreal; and the Venice and SITE Santa Fe Biennales, among others. He’s lectured at <i>dOCUMENTA (13)</i> and the 8th Berlin Biennale and his writing has been published by Sternberg, eflux, Verso, MIT and Princeton Architectural Press. Stankievech has participated in such residencies as The Banff Centre, Fogo Island, Marfa Fieldwork, Atlantic Centre for the Arts, Museumsquartier Vienna, and the Canadian Military. His comprehensively researched curatorial projects include <i>Magnetic Norths</i> and <i>CounterIntelligence</i>—critically acclaimed and award winning exhibitions of 2010 and 2014 respectively. In 2015 he won the OAAG award for best solo exhibition <i>Monument as Ruin</i>. He is an editor of <i>Afterall Journal</i> out of London, and in 2011 founded the art and theory press <i>K.</i> in Berlin. In 2007 he was a founding faculty member of the Yukon School of Visual Arts in Dawson City, Canada (under joint governance by the indigenous sovereign nation of Tr'ondëk Hwëch'in). He is an Associate Professor in the Faculty of Architecture, Landscape and Design at the University of Toronto.
</p>
`,
de: `
<p>
- <a href="https://www.stankievech.net/" target="_blank">www.stankievech.net</a>
- </p>
- <p>
Charles Stankievech (*1978, Kanada) ist ein Künstler, der sich in seinen Arbeiten unter anderem mit dem Konzept der ‘Feldarbeit’ in der eingebetteten Landschaft, dem militärisch-industriellen Geflecht und der Geschichte der Technologie beschäftigt hat. Sein vielseitiges Werk wurde international im Louisiana Museum, Kopenhagen; Palais de Tokyo, Paris; Haus der Kulturen der Welt, Berlin; MassMoca, Massachussetts; Musée d’art contemporain de Montréal; Canadian Centre for Architecture; der Venedig Architektur Biennale sowie der SITE Santa Fe Biennale ausgestellt. Seine Vorträge für die Documenta 13 und die 8. Berlin Biennale waren gleichermaßen Performance wie Pädagogik und seine Texte wurden in akademischen Fachzeitschriften des MIT und der Princeton Architectural Press veröffentlicht. Zu seinen idiosynkratischen und aufwendig recherchierten kuratorischen Projekten gehören Magnetic Norths in der Leonard & Bina Ellen Gallery, Concordia University und CounterIntelligence in der Justina M. Barnicke Gallery, University of Toronto. Von 2010-2011 (und erneut von 2014-15) war er angestellt als privater Auftragnehmer für das Verteidigungsministerium, wo er unter der Rubrik CFAP unabhängige Forschung im Bereich der Geheimdienstoperationen betrieb.  Er war Gründungsmitglied der Yukon School of Visual Arts in Dawson City, Kanada und ist derzeit Assistenzprofessor an der Daniels Faculty of Architecture, Landscape and Design an der University of Toronto. Seit 2011 ist er Co-Direktor des Kunst- und Theorieverlags K. Verlag in Berlin.
</p>
`,
@@ -315,20 +295,15 @@ export const ARTISTS = {
de: "Unfertige Leichenhalle, Accra, Ghana",
},
start: "opoku-1-hail-to-you",
+ homepage: "http://zohraopoku.com/",
bio: {
en: `
<p>
- <a href="http://zohraopoku.com/" target="_blank">www.zohraopoku.com</a>
- </p>
- <p>
Zohra Opoku (b. 1976) is an artist of Ghanaian and German descent based in Accra, Ghana. Opoku’s practice examines the formation of personal identities, particularly in the context of contemporary Ghana, with a special interest in textiles and dress codes within the context of West Africa’s complex history. While her work relays social commentary and broadly relevant themes around the human experience, each of Zohra’s explorations is intimately rooted in personal identity politics. Exhibited internationally, Zohra Opoku has shown work in association with Mariane Ibrahim Gallery (Chicago), Gallery 1957 (Accra), Nubuke Foundation (Accra), Centre for Contemporary Art (Lagos), !Kauru African Contemporary Art (Johannesburg), Commune.1 (Cape Town), Kunsthaus Hamburg (Hamburg), Iwalewahaus (Bayreuth), Musée de l ́Ethnographie (Bourdeaux), Guggenheim Museum (Bilbao), Kunsthal (Rotterdam), Broad Art Museum (Michigan State University) and Museum for Photography (Chicago). Her recent residencies include Institute Sacatar Salvador da Bahia, Brazil; Art Dubai Residents, United Arab Emirates and Black Rock Dakar, Senegal.
</p>
`,
de: `
<p>
- <a href="http://zohraopoku.com/" target="_blank">www.zohraopoku.com</a>
- </p>
- <p>
Zohra Opoku (*1976) ist eine Künstlerin ghanaischer und deutscher Herkunft und lebt in Accra, Ghana. Opokus Praxis untersucht die Bildung persönlicher Identitäten, insbesondere im Kontext des zeitgenössischen Ghanas und mit einem großen Interesse an Textilien und Dresscodes im Zusammenhang mit der komplexen Geschichte Westafrikas. Obwohl ihre Arbeiten sozialkritische und allgemein relevante Themen rund um die menschliche Erfahrung aufgreifen, ist jede von Zohras Auseinandersetzungen tief in der persönlichen Identitätspolitik verankert. International ausgestellt hat Zohra Opoku ihre Arbeiten unter anderem in Kooperation mit der Mariane Ibrahim Gallery (Chicago), Gallery 1957 (Accra), Nubuke Foundation (Accra), dem Centre for Contemporary Art (Lagos), !Kauru African Contemporary Art (Johannesburg), Commune.1 (Kapstadt), Kunsthaus Hamburg (Hamburg), Iwalewahaus (Bayreuth), Musée de l ́Ethnographie (Bordeaux), Guggenheim Museum (Bilbao), Kunsthal (Rotterdam), Broad Art Museum (Michigan State University) sowie dem Museum for Photography (Chicago). Zu ihren jüngsten Residenzen gehören Sacatar Salvador da Bahia, Brazil; Art Dubai Residents, United Arab Emirates und das Black Rock Dakar, Senegal.
</p>
`,
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,
})