Merge branch 'develop' of https://github.com/AAMasters/BackendServers into develop

This commit is contained in:
Julian Molina committed 2020-09-16 10:03:08 +02:00
commit e78d815acd
2 files changed
+5 -3

No files matched your search

+1
View File
@@ -72,6 +72,7 @@ function newAppLoader() {
'Utilities/Branches.js',
'Utilities/Meshes.js',
'Utilities/NodeChildren.js',
'Utilities/Menu.js',
'Panels/LayersPanel.js',
'Panels/UpDownButton.js',
+4 -3
View File
@@ -11,9 +11,10 @@
<script src="externalScripts/CCapture.all.min.js"></script>
<!-- Documentation Style Sheets -->
<!--
<link rel="stylesheet" type="text/css"
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
-->
<script type="text/javascript">
function loadCanvas() {
try {
@@ -42,8 +43,8 @@
<div id="canvasApp"></div>
<div id="docApp" style="position:fixed; top:100000px; left:100000px">
<iframe id="docIFrame" style="border:none; " height="2000"
width="900" src="https://julian-molina.github.io/Documentation/"></iframe>
</div> <!-- -->
width="900" ></iframe>
</div> <!-- src="https://julian-molina.github.io/Documentation/" -->
<div id="textAreaDiv"></div>
<div id="inputDiv" style="font-family:saira condensed;">&nbsp;</div>