Merge branch 'master' of https://git.vvvvvvaria.org/alicestrt/vvvw
This commit is contained in:
commit
62c6bc0a8f
@ -147,7 +147,7 @@ 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" >×</span><span onclick=closethesis() class="thesisX" >×</span> -->
|
<span onclick=closethesis() class="thesisX" >×</span><span onclick=closethesis() class="thesisX" >×</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -251,9 +251,9 @@ includeHTML();
|
|||||||
$("#showbio").hide()
|
$("#showbio").hide()
|
||||||
}
|
}
|
||||||
|
|
||||||
// function closethesis(){
|
function closethesis(){
|
||||||
// $("#nothesis").fadeOut()
|
$("#nothesis").hide()
|
||||||
// }
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -407,7 +407,7 @@ h2 {
|
|||||||
.thesisX {
|
.thesisX {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
z-index:5;
|
z-index:5;
|
||||||
left: 26%;
|
left: 46%;
|
||||||
top: 14%;
|
top: 14%;
|
||||||
float: right;
|
float: right;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
@ -415,6 +415,9 @@ h2 {
|
|||||||
color: black;
|
color: black;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#nothesis {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
/* about and colophon */
|
/* about and colophon */
|
||||||
#menu {
|
#menu {
|
||||||
|
3
static/js/d3_map.js
vendored
3
static/js/d3_map.js
vendored
@ -141,11 +141,12 @@ d3.json("/static/js/group1.json", function(error, json) {
|
|||||||
function popup(name, time) {
|
function popup(name, time) {
|
||||||
$("#show" + name).fadeIn()
|
$("#show" + name).fadeIn()
|
||||||
console.log("around")
|
console.log("around")
|
||||||
|
$("#nothesis").fadeIn()
|
||||||
$("#thesis").fadeIn()
|
$("#thesis").fadeIn()
|
||||||
$("#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();
|
dada.scrollIntoView({ behavior: 'smooth', block: 'nearest', inline: 'start' });
|
||||||
};
|
};
|
||||||
|
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user