Merge branch 'master' into release

This commit is contained in:
fire bingo 2018-09-13 20:34:49 -07:00
커밋 61e5aaca02
3개의 변경된 파일9개의 추가작업 그리고 7개의 파일을 삭제

파일 보기

@ -57,7 +57,9 @@
to { transform: translate(0, -5px); }
}
body { margin: 0; }
html { height: 100%; }
body { margin: 0; height: 100%; }
.flex-grow { flex-grow: 1; }
@ -67,7 +69,7 @@ body { margin: 0; }
#app-container { position: relative; width: 1334px; height: 750px; display: flex; justify-content: center; align-items: center; }
#parent-container { display: flex; flex-direction: column; align-items: center; }
#parent-container { height: 100%; display: flex; flex-direction: column; align-items: center; }
#text-container { color: white; position: absolute; margin: auto; height: 750px; width: 1334px; font-family: 'FOT-RodinNTLGPro'; }
@ -111,9 +113,9 @@ body { margin: 0; }
#dialog-scroll img { height: 35px; }
#title-container { margin-bottom: 2px; }
#title-container { padding: 2px 0; }
#other-controls-container { display: flex; width: 550px; justify-content: center; align-items: center; z-index: 10; }
#other-controls-container { padding-bottom: 4px; display: flex; width: 550px; justify-content: center; align-items: center; z-index: 10; }
#select-mission { min-width: 0; }

파일 보기

@ -1504,8 +1504,8 @@ class Player {
//Sizes the canvas/pixi's renderer to the actual render resolution
this.pixi.app.renderer.resize(res.width * window.devicePixelRatio, res.height * window.devicePixelRatio);
//Css size overwrites the display size of the canvas
this.pixi.app.view.style.width = res.width;
this.pixi.app.view.style.height = res.height;
this.pixi.app.view.style.width = res.width + "px";
this.pixi.app.view.style.height = res.height + "px";
//Transform the text container to be the right scale, browser handles all dpi stuff for html elements itself
document.getElementById('text-container').style.cssText = `transform: scale(${newScale})`;
}

파일 보기

@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">