Merge branch 'dev'
This commit is contained in:
commit
0473d9befb
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "online-3d-viewer",
|
||||
"version": "0.17.0",
|
||||
"version": "0.18.0",
|
||||
"description": "Online 3D Viewer",
|
||||
"license": "MIT",
|
||||
"type": "module",
|
||||
|
||||
@ -76,7 +76,7 @@ div.intro_content
|
||||
{
|
||||
width: 500px;
|
||||
max-width: 90%;
|
||||
margin: 0px auto;
|
||||
margin: 10px auto;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
|
||||
@ -66,7 +66,6 @@ export function StartWebsite ()
|
||||
toolbarDiv : document.getElementById ('toolbar'),
|
||||
mainDiv : document.getElementById ('main'),
|
||||
introDiv : document.getElementById ('intro'),
|
||||
introContentDiv : document.getElementById ('intro_content'),
|
||||
fileNameDiv : document.getElementById ('main_file_name'),
|
||||
leftContainerDiv : document.getElementById ('main_left_container'),
|
||||
navigatorDiv : document.getElementById ('main_navigator'),
|
||||
|
||||
@ -4,7 +4,7 @@ import { ImportErrorCode, ImportSettings } from '../engine/import/importer.js';
|
||||
import { NavigationMode, ProjectionMode } from '../engine/viewer/camera.js';
|
||||
import { RGBColor } from '../engine/model/color.js';
|
||||
import { Viewer } from '../engine/viewer/viewer.js';
|
||||
import { AddDiv, AddDomElement, ShowDomElement, SetDomElementOuterHeight, CreateDomElement, GetDomElementOuterWidth, GetDomElementOuterHeight } from '../engine/viewer/domutils.js';
|
||||
import { AddDiv, AddDomElement, ShowDomElement, SetDomElementOuterHeight, CreateDomElement, GetDomElementOuterWidth } from '../engine/viewer/domutils.js';
|
||||
import { CalculatePopupPositionToScreen, ShowListPopup } from './dialogs.js';
|
||||
import { HandleEvent } from './eventhandler.js';
|
||||
import { HashHandler } from './hashhandler.js';
|
||||
@ -175,10 +175,6 @@ class WebsiteLayouter
|
||||
SetDomElementOuterHeight (this.parameters.introDiv, contentHeight);
|
||||
this.viewer.Resize (contentWidth - safetyMargin, contentHeight);
|
||||
|
||||
let introContentHeight = GetDomElementOuterHeight (this.parameters.introContentDiv);
|
||||
let introContentTop = (contentHeight - introContentHeight) / 3.0;
|
||||
this.parameters.introContentDiv.style.top = introContentTop.toString () + 'px';
|
||||
|
||||
this.measureTool.Resize ();
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user