浏览代码

viewer maintenance

Trevor Baron 6 年之前
父节点
当前提交
0edfcc6e7c

二进制
Viewer/assets/img/BabylonJS_Logo_Small.png


二进制
Viewer/assets/img/loading.png


二进制
Viewer/assets/img/spinner.png


+ 4 - 3
Viewer/assets/templates/default/loadingScreen.html

@@ -16,8 +16,8 @@
     }
 
     img.loading-image {
-        -webkit-animation: spin 2s linear infinite;
-        animation: spin 2s linear infinite;
+        -webkit-animation: spin 0.75s linear infinite;
+        animation: spin 0.75s linear infinite;
     }
 
     @-webkit-keyframes spin {
@@ -39,4 +39,5 @@
     }
 </style>
 
-<img class="loading-image" src="{{loadingImage}}">
+<img class="loading-image" style="position:absolute" src="{{loadingImage}}">
+<img class="static-loading-image" style="position:absolute" src="{{staticLoadingImage}}">

+ 1 - 0
Viewer/assets/templates/default/navbar.html

@@ -85,6 +85,7 @@
     .logo-button img {
         height: 20px;
         width: 20px;
+        padding-top: 5px;
     }
 
     .types {

+ 2 - 1
Viewer/src/assets/img.ts

@@ -2,4 +2,5 @@ export const babylonLogo = require('../../assets/img/BabylonJS_Logo_Small.png');
 export const close = require('../../assets/img/close.png');
 export const fullscreen = require('../../assets/img/fullscreen.png');
 export const helpCircle = require('../../assets/img/help-circle.png');
-export const loading = require('../../assets/img/loading.png');
+export const loading = require('../../assets/img/spinner.png');
+export const staticLoading = require('../../assets/img/loading.png');

+ 2 - 1
Viewer/src/configuration/types/default.ts

@@ -28,7 +28,8 @@ export let defaultConfiguration: ViewerConfiguration = deepmerge(renderOnlyDefau
             html: loadingScreen,
             params: {
                 backgroundColor: "#000000",
-                loadingImage: images.loading
+                loadingImage: images.loading,
+                staticLoadingImage: images.staticLoading
             }
         },
         viewer: {

二进制
Viewer/tests/validation/LogoV3.png