Browse Source

fixed conflict index

master
alicestrt 3 years ago
parent
commit
118f8fb65e
  1. 72
      index.html
  2. 10
      static/css/style.css
  3. 4
      static/js/d3_map.js
  4. 1
      thesis.html

72
index.html

@ -91,48 +91,33 @@ Through the map, we give shape to a common context in Turkish culture. The map a
</div>
</div><br>
<div id="showcolophon" class="draggable"><span onclick="this.parentElement.style.display='none'" class="topleft">&times</span><div><h3>Colophon</h3>
<p>Wells of Knowledge: Poetry, Music and Rresistance in Turkey<br>
© 2020 at.wdka.nl/wellsofknowledge</p>
<p>Developed by Hybrid Publishing,<br>
Willem de Kooning Academy</p>
<p>Text and images © Merve Kılıçer<br>
All rights reserved</p>
<p>ISBN: 9789492479112</p>
<p>Author: Merve Kılıçer</p>
<p>
Graphic Design & Web Development: Angeliki Diakrousi
(https://w­i­t­m.net/) and Alice Strete (https://alicestrete.me/)</p>
<p>Editor: Liz Allan</p>
<p>Coordination: Kimmy Spreeuwenberg</p>
<p>Printer: De Raddraaier, Amsterdam<br>
Paper: Old Mill/Bianco 100g<br>
Print Run: 300</p>
<p>
Thanks for the generous support of Nihan Somay, Jake Caleb,
Ulufer Çelik and Carmen José</p>
<p>Hybrid Publishing<br>
This publication was developed by Hybrid Publishing, founded by
the Willem de Kooning Academy as a means of profiling and
disseminating outstanding research conducted by its students and
teaching staff, whether independently or in collaboration with
external partners. Researching and experimenting across a broad
range of processes native to digital and analog media, WdKA
Hybrid Publishing fosters novel approaches to design, authoring,
reading and dissemination made possible through ongoing
developments from the legacies of Gutenberg’s press to present­day
technologies. (hybridpublishing.wdka.nl) </p>
<p>HP Research Awards<br>
The HP Research Awards series showcases the work of recipients
or nominees of the Willem de Kooning Research Award.
Established by the Willem de Kooning Foundation, the awards are
granted to outstanding students whose graduation projects and
research have helped provide new insights to broader audiences. For
a digital version of this and other publications, go to
at.wdka.nl/hpresearchawards</p>
<img class="logo" src="static/images/HP_Logo.png"></img>
<img class="logo" src="static/images/wdka_logo.png"></img>
<img class="logo" src="static/images/pzi_logo.png"></img></div>
<div id="showcolophon" class="draggable"><span onclick="this.parentElement.style.display='none'" class="topleft">&times</span><div><h2>colophon</h2>
Wells of Knowledge: Poetry, music and resistance in Turkey © 2020<br>
at.wdka.nl/wellsofknowledge<br>
Developed by Hybrid Publishing,<br>
Willem de Kooning Academy<br>
Text and images © Merve Kılıçer<br>
All rights reserved<br>
ISBN: XXXX<br>
Author: Merve Kılıçer<br>
Graphic Design &amp; Web Development: Angeliki Diakrousi and Alice Strete<br>
Editor: Liz Allan<br>
Coordination: Kimmy Spreeuwenberg<br>
[@Merve - ADD THANK YOU MESSAGE HERE]<br>
Hybrid Publishing<br>
This publication was developed by Hybrid Publishing, founded by the Willem de Kooning
Academy as a means of profiling and disseminating outstanding research conducted by its
students and teaching staff, whether independently or in collaboration with external
partners. Researching and experimenting across a broad range of processes native to digital
and analog media, WdKA Hybrid Publishing fosters novel approaches to design, authoring,
reading and dissemination made possible through ongoing developments from the legacies
of Gutenberg’s press to present-day technologies. (hybridpublishing.wdka.nl)<br>
HP Research Awards<br>
The HP Research Awards series showcases the work of recipients or nominees of the Willem
de Kooning Research Award. Established by the Willem de Kooning Foundation, the awards
are granted to outstanding students whose graduation projects and research have helped
provide new insights to broader audiences. For a digital version of this and other
publications, go to at.wdka.nl/hpresearchawards</div>
</div>
<div id="showhow" class="draggable"><span onclick="this.parentElement.style.display='none'" class="topleft">&times</span><div><h3>How to use</h3>
@ -149,7 +134,6 @@ Through the map, we give shape to a common context in Turkish culture. The map a
<div id="nothesis">
<div w3-include-html="thesis.html" id="thesis" class="draggable thesis">
</div>
<span onclick=closethesis() class="thesisX" >&times</span><span onclick=closethesis() class="thesisX" >&times</span>
</div>
</div>
@ -170,6 +154,8 @@ $(document).ready(function() {
{
start: function(event, ui) { $(this).css('z-index', a++); }
});});
</script>

10
static/css/style.css

@ -54,6 +54,7 @@ body {
margin-right: 10px;
margin-left: 20px;
position: relative;
border-top: 1px dashed #d81159;;
}
.media_area {
margin-top: 10px;
@ -403,18 +404,18 @@ h2 {
.topleft {
float: right;
cursor: pointer;
font-size: 100%;
font-size: 16px;
color: black;
}
.thesisX {
position: absolute;
z-index:5;
left: 46%;
top: 14%;
left: 96%;
top: 8%;
float: right;
cursor: pointer;
font-size: 100%;
font-size: 16px;
color: black;
}
@ -422,6 +423,7 @@ h2 {
display: none;
}
/* about and colophon */
#menu {
margin-top: 15px;

4
static/js/d3_map.js

@ -101,6 +101,8 @@ d3.json("/static/js/group1.json", function(error, json) {
});
// highlight NodeLists//Toggle stores whether the highlighting is on
var toggle = 0;
//Create an array logging what is connected to what
@ -146,7 +148,7 @@ d3.json("/static/js/group1.json", function(error, json) {
$("#bio" + name).fadeIn()
var dada = document.getElementById("text" + name);
dada.className += " active";
dada.scrollIntoView({ behavior: 'smooth', block: 'nearest', inline: 'start' });
dada.scrollIntoView({ behavior: 'smooth', block: 'nearest', inline: 'nearest' });
};
});

1
thesis.html

@ -1,3 +1,4 @@
<span onclick=closethesis() class="thesisX" >&times</span>
<div>
<h1>Wells of Knowledge: <p>Streams of poetry, music and resistance in Turkey</h1>
<h2>Merve Kılıçer</h2>

Loading…
Cancel
Save