mirror of
https://github.com/placeAtlas/atlas.git
synced 2024-12-24 19:14:09 +01:00
Merge branch 'master' into patch-1
This commit is contained in:
commit
1a18d532f4
9 changed files with 24 additions and 1874 deletions
|
@ -125,7 +125,7 @@ header {
|
|||
background-color: #555;
|
||||
border-right: 1px #000 solid;
|
||||
border-bottom: 1px #000 solid;
|
||||
z-index: 1000;
|
||||
z-index: 2000;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
|
@ -310,10 +310,10 @@ .listHidden #container {
|
|||
}
|
||||
|
||||
#innerContainer {
|
||||
height: 1000px;
|
||||
width: 1000px;
|
||||
height: 2000px;
|
||||
width: 2000px;
|
||||
position: absolute;
|
||||
z-index: -1000;
|
||||
z-index: -2000;
|
||||
}
|
||||
|
||||
#image {
|
||||
|
@ -869,7 +869,7 @@ .listHidden #hideListButton {
|
|||
border-top: 1px #333 solid;
|
||||
width: 130px;
|
||||
height: 35px;
|
||||
z-index: 1000;
|
||||
z-index: 2000;
|
||||
}
|
||||
|
||||
#hideListButton:focus {
|
||||
|
@ -947,7 +947,7 @@ #aboutContainer {
|
|||
bottom: 0;
|
||||
background-color: #333;
|
||||
display: block;
|
||||
z-index: 1000;
|
||||
z-index: 2000;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
|
|
BIN
web/_img/place-indexed-3.png
Normal file
BIN
web/_img/place-indexed-3.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.1 MiB |
Binary file not shown.
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 2.4 MiB |
|
@ -48,7 +48,7 @@ function initDraw(){
|
|||
|
||||
var backgroundCanvas = document.createElement("canvas");
|
||||
backgroundCanvas.width = 2000;
|
||||
backgroundCanvas.height = 1000;
|
||||
backgroundCanvas.height = 2000;
|
||||
var backgroundContext = backgroundCanvas.getContext("2d");
|
||||
|
||||
var highlightUncharted = true;
|
||||
|
|
|
@ -61,11 +61,11 @@ function applyView(){
|
|||
//console.log(scaleZoomOrigin[0]);
|
||||
|
||||
scaleZoomOrigin[0] = Math.max(-1000, Math.min(1000, scaleZoomOrigin[0]));
|
||||
scaleZoomOrigin[1] = Math.max(-500, Math.min(500, scaleZoomOrigin[1]));
|
||||
scaleZoomOrigin[1] = Math.max(-1000, Math.min(1000, scaleZoomOrigin[1]));
|
||||
|
||||
zoomOrigin = [scaleZoomOrigin[0]*zoom, scaleZoomOrigin[1]*zoom];
|
||||
|
||||
innerContainer.style.height = (~~(zoom*1000))+"px";
|
||||
innerContainer.style.height = (~~(zoom*2000))+"px";
|
||||
innerContainer.style.width = (~~(zoom*2000))+"px";
|
||||
|
||||
innerContainer.style.left = ~~(container.clientWidth/2 - innerContainer.clientWidth/2 + zoomOrigin[0] + container.offsetLeft)+"px";
|
||||
|
|
1850
web/_js/minified.js
1850
web/_js/minified.js
File diff suppressed because it is too large
Load diff
|
@ -34,7 +34,7 @@ function initOverlap(){
|
|||
|
||||
var backgroundCanvas = document.createElement("canvas");
|
||||
backgroundCanvas.width = 2000;
|
||||
backgroundCanvas.height = 1000;
|
||||
backgroundCanvas.height = 2000;
|
||||
var backgroundContext = backgroundCanvas.getContext("2d");
|
||||
|
||||
var filterInput = document.getElementById("searchList");
|
||||
|
@ -72,12 +72,12 @@ function initOverlap(){
|
|||
highlightEntryFromUrl();
|
||||
}*/
|
||||
|
||||
if(document.documentElement.clientWidth > 1000){
|
||||
if(document.documentElement.clientWidth > 2000){
|
||||
entriesListShown = true;
|
||||
wrapper.className = wrapper.className.replace(/ listHidden/g, "");
|
||||
}
|
||||
|
||||
if(document.documentElement.clientWidth < 1000){
|
||||
if(document.documentElement.clientWidth < 2000){
|
||||
entriesListShown = false;
|
||||
wrapper.className += " listHidden";
|
||||
}
|
||||
|
@ -546,12 +546,12 @@ function initOverlap(){
|
|||
window.addEventListener("resize", function(){
|
||||
//console.log(document.documentElement.clientWidth, document.documentElement.clientHeight);
|
||||
|
||||
if(document.documentElement.clientWidth > 1000 && viewportWidth <= 1000){
|
||||
if(document.documentElement.clientWidth > 2000 && viewportWidth <= 2000){
|
||||
entriesListShown = true;
|
||||
wrapper.className = wrapper.className.replace(/ listHidden/g, "");
|
||||
}
|
||||
|
||||
if(document.documentElement.clientWidth < 1000 && viewportWidth >= 1000){
|
||||
if(document.documentElement.clientWidth < 2000 && viewportWidth >= 2000){
|
||||
entriesListShown = false;
|
||||
wrapper.className += " listHidden";
|
||||
}
|
||||
|
|
|
@ -31,7 +31,7 @@ var previousScaleZoomOrigin = [0, 0];
|
|||
|
||||
var backgroundCanvas = document.createElement("canvas");
|
||||
backgroundCanvas.width = 2000;
|
||||
backgroundCanvas.height = 1000;
|
||||
backgroundCanvas.height = 2000;
|
||||
var backgroundContext = backgroundCanvas.getContext("2d");
|
||||
|
||||
function updateLines(){
|
||||
|
@ -162,12 +162,12 @@ function initView(){
|
|||
highlightEntryFromUrl();
|
||||
}*/
|
||||
|
||||
if(document.documentElement.clientWidth > 1000){
|
||||
if(document.documentElement.clientWidth > 2000){
|
||||
entriesListShown = true;
|
||||
wrapper.className = wrapper.className.replace(/ listHidden/g, "");
|
||||
}
|
||||
|
||||
if(document.documentElement.clientWidth < 1000){
|
||||
if(document.documentElement.clientWidth < 2000){
|
||||
entriesListShown = false;
|
||||
wrapper.className += " listHidden";
|
||||
}
|
||||
|
@ -330,7 +330,7 @@ function initView(){
|
|||
];
|
||||
|
||||
scaleZoomOrigin = [
|
||||
1000/2 - entry.center[0]// + container.offsetLeft
|
||||
2000/2 - entry.center[0]// + container.offsetLeft
|
||||
,2000/2 - entry.center[1]// + container.offsetTop
|
||||
];
|
||||
|
||||
|
@ -539,7 +539,7 @@ function initView(){
|
|||
]
|
||||
|
||||
scaleZoomOrigin = [
|
||||
1000/2 - this.entry.center[0]
|
||||
2000/2 - this.entry.center[0]
|
||||
,2000/2 - this.entry.center[1]
|
||||
]
|
||||
|
||||
|
@ -579,7 +579,7 @@ function initView(){
|
|||
]
|
||||
|
||||
scaleZoomOrigin = [
|
||||
1000/2 - this.entry.center[0]
|
||||
2000/2 - this.entry.center[0]
|
||||
,2000/2 - this.entry.center[1]
|
||||
]
|
||||
|
||||
|
@ -761,12 +761,12 @@ function initView(){
|
|||
|
||||
var viewportWidth = document.documentElement.clientWidth;
|
||||
|
||||
if(document.documentElement.clientWidth > 1000 && viewportWidth <= 1000){
|
||||
if(document.documentElement.clientWidth > 2000 && viewportWidth <= 2000){
|
||||
entriesListShown = true;
|
||||
wrapper.className = wrapper.className.replace(/ listHidden/g, "");
|
||||
}
|
||||
|
||||
if(document.documentElement.clientWidth < 1000 && viewportWidth >= 1000){
|
||||
if(document.documentElement.clientWidth < 2000 && viewportWidth >= 2000){
|
||||
entriesListShown = false;
|
||||
wrapper.className += " listHidden";
|
||||
}
|
||||
|
|
|
@ -98,8 +98,8 @@ <h1 id="title">The /r/place Atlas</h1>
|
|||
</div>
|
||||
<canvas id="linesCanvas"></canvas>
|
||||
<div id="innerContainer">
|
||||
<canvas id="highlightCanvas" width="2000" height="1000"></canvas>
|
||||
<img id="image" src="./_img/place-indexed.png" width="2000" height="1000" alt="Canvas of /r/place in the state of when the experiment was concluded." />
|
||||
<canvas id="highlightCanvas" width="2000" height="2000"></canvas>
|
||||
<img id="image" src="./_img/place-indexed.png" width="2000" height="2000" alt="Canvas of /r/place in the state of when the experiment was concluded." />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
Loading…
Reference in a new issue