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

Merge branch 'master' of ssh://vvvvvvaria.org:12345/alicestrt/vvvw

master
nglk 4 years ago
parent
54a8b64e5c a5611bc472
commit
f170a15094
4 changed files with 24 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      wells/index.html
  2. 16
      wells/static/css/style.css
  3. BIN
      wells/static/images/orange.png
  4. 4
      wells/static/js/d3_map.js

24
wells/index.html
View File

@ -37,20 +37,24 @@
</audio> </audio>
</div> </div>
</div> </div>
<div id="about_colophon">
<a href="#" >About</a>|<a href="#" >Colophon</a>
</div>
<div id="showabout" class="draggable"><span onclick="this.parentElement.style.display='none'" class="topleft">&times</span><div>about texthjgjhghjgfhdgfhdgfhdsgfhsgfhsgdfjhgdsfhsfgdfjgsfgdshsgfhsgfffffffffffffdfhdsfjsgdfjgjdsgfsjdgfjshgdf</div>
</div>
<div id="showcolophon" class="draggable"><span onclick="this.parentElement.style.display='none'" class="topleft">&times</span><div>about texthjgjhghjgfhdgfhdgfhdsgfhsgfhsgdfjhgdsfhsfgdfjgsfgdshsgfhsgfffffffffffffdfhdsfjsgdfjgjdsgfsjdgfjshgdf</div>
</div>
</div> </div>
</div>
<div class="col-md-3">
<div id="about_colophon">
<a href="#" >About</a>|<a href="#" >Colophon</a>
</div>
<div id="showabout" class="draggable"><span onclick="this.parentElement.style.display='none'" class="topleft">&times</span><div>about texthjgjhghjgfhdgfhdgfhdsgfhsgfhsgdfjhgdsfhsfgdfjgsfgdshsgfhsgfffffffffffffdfhdsfjsgdfjgjdsgfsjdgfjshgdf</div>
</div>
<div id="showcolophon" class="draggable"><span onclick="this.parentElement.style.display='none'" class="topleft">&times</span><div>about texthjgjhghjgfhdgfhdgfhdsgfhsgfhsgdfjhgdsfhsfgdfjgsfgdshsgfhsgfffffffffffffdfhdsfjsgdfjgjdsgfsjdgfjshgdf</div>
</div>
</div>
</div> </div>
<!-- new row should start here --> <!-- new row should start here -->
<!-- map area --> <!-- map area -->
<div class="row"> <div class="row">
<div class="col-md-8 offset-md-1"> <div class="col-md-10 offset-md-1">
<div class="map_area"> <div class="map_area">
<div w3-include-html="thesis.html" class="thesis draggable" id="showthesis"> <div w3-include-html="thesis.html" class="thesis draggable" id="showthesis">
</div> </div>
@ -73,7 +77,7 @@
<div class="draggable" id="showmuharrem"><div class='text_audio'></div><iframe width="300" height="150" src="https://www.youtube.com/embed/Ffa2CONoW5Q" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe></div> <div class="draggable" id="showmuharrem"><div class='text_audio'></div><iframe width="300" height="150" src="https://www.youtube.com/embed/Ffa2CONoW5Q" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe></div>
<div class="draggable" id="shownazim"><div class='text_audio'></div><iframe width="300" height="150" src="https://www.youtube.com/embed/11XRG-cz3lY" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe></div> <div class="draggable" id="shownazim"><div class='text_audio'></div><iframe width="360" height="80" src="https://www.youtube.com/embed/11XRG-cz3lY" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen="false"></iframe></div>
<div class="draggable" id="showneyzen"><div class='text_audio'></div><iframe width="300" height="150" src="https://www.youtube.com/embed/CD-CEeaLGdk" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe></div> <div class="draggable" id="showneyzen"><div class='text_audio'></div><iframe width="300" height="150" src="https://www.youtube.com/embed/CD-CEeaLGdk" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe></div>
@ -101,6 +105,8 @@
</div> </div>
</div> </div>
<!--moved about temporarily-->
<!-- scripts for mouse events --> <!-- scripts for mouse events -->
<script> <script>
var audio = document.getElementById("audioBG"); var audio = document.getElementById("audioBG");

16
wells/static/css/style.css
View File

@ -45,9 +45,6 @@ position: relative;
/*height: 150px;*/ /*height: 150px;*/
} }
.link {
stroke: #ccc;
}
.node text { .node text {
pointer-events: none; pointer-events: none;
@ -74,7 +71,7 @@ cursor: pointer;
.group2 { .group2 {
fill: #92817a ; fill: #92817a ;
font-size: 18px; font-size: 20px;
font-family: 'Vesper Libre', serif; font-family: 'Vesper Libre', serif;
z-index: 2; z-index: 2;
} }
@ -83,7 +80,7 @@ cursor: pointer;
.group1 { .group1 {
fill: #bedbbb; fill: #bedbbb;
font-size: 18px; font-size: 20px;
font-family: 'Vesper Libre', serif; font-family: 'Vesper Libre', serif;
z-index: 1; z-index: 1;
} }
@ -91,7 +88,7 @@ cursor: pointer;
.group4 { .group4 {
fill: #8db956; fill: #8db956;
font-family: 'Vesper Libre', serif; font-family: 'Vesper Libre', serif;
font-size: 18px; font-size: 20px;
z-index: 4; z-index: 4;
} }
@ -99,7 +96,7 @@ z-index: 4;
.group3 { .group3 {
fill: #707070; fill: #707070;
font-family: 'Vesper Libre', serif; font-family: 'Vesper Libre', serif;
font-size: 18px; font-size: 20px;
z-index: 3; z-index: 3;
@ -180,9 +177,10 @@ stroke-dasharray:6px;
#legend_title { #legend_title {
font-family: 'Vesper Libre', serif; font-family: 'Vesper Libre', serif;
font-size: .8em; font-size: 1em;
padding-left: 2em; padding-left: 2em;
position: relative; position: relative;
margin-top: 1em;
} }
/* text area */ /* text area */
@ -341,7 +339,7 @@ h2 {
/*d3 map*/ /*d3 map*/
.link { .link {
stroke: #ccc; stroke: #c46666;
} }
.node text { .node text {

BIN
wells/static/images/orange.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 871 B

4
wells/static/js/d3_map.js
View File

@ -4,7 +4,7 @@ var width = 700,
var svg = d3.select(".map_area").append("svg") var svg = d3.select(".map_area").append("svg")
.attr("width", width) .attr("width", width)
.attr("height", height) .attr("height", height)
.attr("viewBox", `${-width/1.3} ${-height/1.6} ${width*2.3} ${height*2.3}`); .attr("viewBox", `${-width/1.5} ${-height/1.6} ${width*2.7} ${height*2.3}`);
var force = d3.layout.force() var force = d3.layout.force()
.gravity(0.009) .gravity(0.009)
@ -82,7 +82,7 @@ function connectedNodes() {
node.append("image") node.append("image")
// .attr("xlink:href", "/static/images/squig2.png") // .attr("xlink:href", "/static/images/squig2.png")
.attr("xlink:href", "../images/circleB.png") .attr("xlink:href", "/static/images/circleB.png")
.attr("x", -8) .attr("x", -8)
.attr("y", -8) .attr("y", -8)
.attr("width", 16) .attr("width", 16)

Write Preview
Loading…
Cancel
Save