diff --git a/index.html b/index.html index f58005e..e6cc06f 100644 --- a/index.html +++ b/index.html @@ -101,10 +101,11 @@ Through the map, we give shape to a common context in Turkish culture. The map a -
+
+
- - + +
@@ -195,7 +196,7 @@ includeHTML(); - function closevideo (){ + function closevideo(){ $("#showvideo").hide() $('iframe').each(function(index) { $(this).attr('src', $(this).attr('src')); @@ -203,6 +204,16 @@ includeHTML(); }); } + function closebio(){ + $("#showbio").hide() + } + + // function closethesis(){ + // $("#nothesis").fadeOut() + // } + + + @@ -225,42 +236,6 @@ $("#about").click(function(){ - - - diff --git a/static/css/style.css b/static/css/style.css index 8976519..44dccf6 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -341,7 +341,6 @@ h2 { top:10%; padding: 0.5%; background-color: transparent; - position: absolute; z-index: 5; border: 1px black solid; opacity: 0.4; @@ -360,7 +359,6 @@ h2 { bottom: 10%; padding: 2%; background-color: transparent; - position: absolute; z-index: 5; border: 1px black solid; overflow-y: scroll; @@ -396,12 +394,15 @@ h2 { color: black; } -#thesisX { +.thesisX { position: absolute; z-index:5; - left: 480px; + left: 26%; top: 14%; - display: none; + float: right; + cursor: pointer; + font-size: 100%; + color: black; } @@ -466,6 +467,7 @@ color: #d81159; .node text:hover { cursor: pointer; + font-style: italic; } .active { diff --git a/static/js/d3_map.js b/static/js/d3_map.js index 080d470..89944c4 100644 --- a/static/js/d3_map.js +++ b/static/js/d3_map.js @@ -69,10 +69,10 @@ d3.json("/static/js/group1.json", function(error, json) { console.log('vid') if (i.url) { divVideo.transition().duration(100); - divVideo.html("
  × 
"); + divVideo.html("
  × 
"); }; divBio.transition().duration(100); - divBio.html("
  × 
" + i.bio + "
"); + divBio.html("
  × 
" + i.bio + "
"); popup(i.id, i.time); }) .on("dblclick", connectedNodes) @@ -142,7 +142,6 @@ d3.json("/static/js/group1.json", function(error, json) { $("#show" + name).fadeIn() console.log("around") $("#thesis").fadeIn() - $("#thesisX").fadeIn() $("#bio" + name).fadeIn() var dada = document.getElementById("text" + name); dada.className += " active";