alicestrt/vvvw
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed conflict index

Browse Source
This commit is contained in:
alicestrt 2021-03-01 14:58:01 +01:00
commit 118f8fb65e
4 changed files with 39 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
index.html
View File

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

10
static/css/style.css
View File

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

4
static/js/d3_map.js vendored
View File

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

1
thesis.html
View File

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