Merge branch 'master' of ssh://git.xpub.nl:2501/Angeliki/eaiaiaiaoi

master
Angeliki 5 years ago
commit 70a4aeda21

@ -312,7 +312,7 @@
<!-- links --> <!-- links -->
<div class="draggable box_metadata" style="top: 40%; left:0.5%; width: 500px !important"> <div class="draggable box_metadata" style="top: 1%; left:0.5%; width: 500px !important">
<h2>Online Sources</h2> <h2>Online Sources</h2>
<li id="angela"> <li id="angela">
<a href="#" >Angela Davis @Occupy Wall Street</a> <a href="#" >Angela Davis @Occupy Wall Street</a>
@ -365,7 +365,7 @@ $("#katalin").click(function(){
<!-- soundwalk player --> <!-- soundwalk player -->
<div class="draggable full-width" style="top: 180%; left:0.2%"> <div class="draggable full-width" style="top: 260%; left:0.2%">
<button id="but"><h3>listen</h3></button> <button id="but"><h3>listen</h3></button>
First sample of city sounds, related to public/private and speech, and recordings of people describing them First sample of city sounds, related to public/private and speech, and recordings of people describing them
<div class="tooltip-wrap no-pink"> <div class="tooltip-wrap no-pink">
@ -450,7 +450,7 @@ $("#katalin").click(function(){
<!-- second sounwalk player --> <!-- second sounwalk player -->
<div class="draggable full-width" style="top: 210%; left:0.2%"> <div class="draggable full-width" style="top: 300%; left:0.2%">
<button id="butB"><h3>listen</h3></button> <button id="butB"><h3>listen</h3></button>
Second sample of city sounds, related to public/private and speech, and recordings of people describing them Second sample of city sounds, related to public/private and speech, and recordings of people describing them
<div class="tooltip-wrap no-pink"> <div class="tooltip-wrap no-pink">
@ -522,14 +522,14 @@ $("#katalin").click(function(){
<!-- draggable menu--> <!-- draggable menu-->
<div class="draggable scaleable-wrapper menu" style="top:160%;left: 5; width: 300px; font-size: 20px"> <div class="draggable scaleable-wrapper menu" style="top:190%;left: 5; width: 300px; font-size: 20px">
<h2 ><a href="diary.php">Diary of West Rotterdam</a></h2> <h2 ><a href="diary.php">Diary of West Rotterdam</a></h2>
<div class="drag-content"> <div class="drag-content">
(first experiments) (first experiments)
</div> </div>
</div> </div>
<div class="draggable scaleable-wrapper menu" style="top:75%; left: 1%;width: 250px; font-size: 16px"> <div class="draggable scaleable-wrapper menu" style="top:205%; left: 1%;width: 250px; font-size: 16px">
<h2><a href="amplification.php">Amplification of female voices</a></h2> <h2><a href="amplification.php">Amplification of female voices</a></h2>
<div class="drag-content"> <div class="drag-content">
(workshops) (workshops)
@ -537,7 +537,7 @@ $("#katalin").click(function(){
</div> </div>
<div class="draggable scaleable-wrapper menu" style="top: 30%; right: 0.5%;width: 150px; font-size: 16px"> <div class="draggable scaleable-wrapper menu" style="top: 1%; right: 0.5%;width: 150px; font-size: 16px">
<h2 ><a href="index.php">About</a></h2> <h2 ><a href="index.php">About</a></h2>
<div class="drag-content"> <div class="drag-content">
(main page) (main page)
@ -545,7 +545,7 @@ $("#katalin").click(function(){
</div> </div>
<div class="draggable scaleable-wrapper menu" style="top: 5%; right: 1%; z-index: 9;width: 250px; font-size: 16px"> <div class="draggable scaleable-wrapper menu" style="top: 215%; left: 1%; width: 250px; font-size: 16px">
<h2 ><a href="thesis-angeliki.php">"Let' s Talk About Unspeakable Things"</a></h2> <h2 ><a href="thesis-angeliki.php">"Let' s Talk About Unspeakable Things"</a></h2>
<div class="drag-content"> <div class="drag-content">
(thesis) (thesis)
@ -553,26 +553,26 @@ $("#katalin").click(function(){
</div> </div>
<div class="draggable scaleable-wrapper menu" style="top: 100%; left: 2%;"> <div class="draggable scaleable-wrapper menu" style="top: 230%; left: 1%;">
<h2 ><a href="podcast1.php">"Mediating Speech"<div class="hover-icon"><img src="images/icon-play.png"></div></a></h2> <h2 ><a href="podcast1.php">"Mediating Speech"<div class="hover-icon"><img src="images/icon-play.png"></div></a></h2>
<div class="drag-content"> <div class="drag-content">
(podcast) (podcast)
</div> </div>
</div> </div>
<div class="draggable scaleable-wrapper menu" style="top: 105%; left: 3%;"> <div class="draggable scaleable-wrapper menu" style="top: 240%; left: 1%;">
<h2 ><a href="podcast2.php">"Voice's Transition"<div class="hover-icon"><img src="images/icon-play.png"></div></a></h2> <h2 ><a href="podcast2.php">"Voice's Transition"<div class="hover-icon"><img src="images/icon-play.png"></div></a></h2>
<div class="drag-content"> <div class="drag-content">
(podcast) (podcast)
</div> </div>
</div> </div>
<div class="draggable scaleable-wrapper menu" style="top: 115%; left: 1%;"> <div class="draggable scaleable-wrapper menu" style="top: 250%; left: 1%;">
<h2 ><a href="podcast3.php">"Blocking our Voices"<div class="hover-icon"><img src="images/icon-play.png"></div></a></h2> <h2 ><a href="podcast3.php">"Blocking our Voices"<div class="hover-icon"><img src="images/icon-play.png"></div></a></h2>
<div class="drag-content"> <div class="drag-content">
(podcast) (podcast)
</div> </div>
</div> </div>
<div class="draggable scaleable-wrapper active-draggable" style="top: 1%; left: 1%;"> <div class="draggable scaleable-wrapper active-draggable" style="top: 72%; left: 43%;">
<h2 ><a class="active" href="player.php">Player</a></h2> <h2 ><a class="active" href="player.php">Player</a></h2>
<div class="drag-content"> <div class="drag-content">
<?php include 'texts/player.txt'; ?> <?php include 'texts/player.txt'; ?>

Loading…
Cancel
Save