浏览代码

Merge branch 'master' of https://github.com/BabylonJS/Babylon.js

David Catuhe 7 年之前
父节点
当前提交
a15331a49f

+ 2 - 2
inspector/src/tools/AbstractTool.ts

@@ -3,11 +3,11 @@ module INSPECTOR {
         private _elem: HTMLElement;
         protected _inspector: Inspector;
 
-        constructor(icon: string, parent: HTMLElement, inspector: Inspector, tooltip: string) {
+        constructor(iconSet: string, icon: string, parent: HTMLElement, inspector: Inspector, tooltip: string) {
             this._inspector = inspector;
 
             this._elem = Inspector.DOCUMENT.createElement('i');
-            this._elem.className = `tool fa ${icon}`;
+            this._elem.className = `tool ${iconSet} ${icon}`;
             parent.appendChild(this._elem);
 
             this._elem.addEventListener('click', (e) => {

+ 1 - 1
inspector/src/tools/DisposeTool.ts

@@ -6,7 +6,7 @@ module INSPECTOR {
     export class DisposeTool extends AbstractTool {
 
         constructor(parent:HTMLElement, inspector:Inspector) {
-            super('fa-times', parent, inspector, 'Close the inspector panel');
+            super('fa', 'fa-times', parent, inspector, 'Close the inspector panel');
         }
 
         // Action : refresh the whole panel

+ 1 - 1
inspector/src/tools/FullscreenTool.ts

@@ -3,7 +3,7 @@ module INSPECTOR {
     export class FullscreenTool extends AbstractTool {
 
         constructor(parent:HTMLElement, inspector:Inspector) {
-            super('fa-expand', parent, inspector, 'Open the scene in fullscreen, press Esc to exit');
+            super('fa', 'fa-expand', parent, inspector, 'Open the scene in fullscreen, press Esc to exit');
         }
 
         // Action : refresh the whole panel

+ 1 - 1
inspector/src/tools/LabelTool.ts

@@ -10,7 +10,7 @@ module INSPECTOR {
         private _guiLoaded: boolean = false;
 
         constructor(parent: HTMLElement, inspector: Inspector) {
-            super('fa-tags', parent, inspector, 'Display mesh names on the canvas');
+            super('fa', 'fa-tags', parent, inspector, 'Display mesh names on the canvas');
 
             this._scene = inspector.scene;
         }

+ 1 - 1
inspector/src/tools/PauseScheduleTool.ts

@@ -5,7 +5,7 @@ module INSPECTOR {
         private _isPause : boolean = false;
 
         constructor(parent:HTMLElement, inspector:Inspector) {
-            super('fa-pause', parent, inspector, 'Pause the automatic update of properties');
+            super('fa', 'fa-pause', parent, inspector, 'Pause the automatic update of properties');
         }
 
         // Action : refresh the whole panel

+ 1 - 1
inspector/src/tools/PickTool.ts

@@ -6,7 +6,7 @@ module INSPECTOR {
         private _pickHandler: (evt: Event) => void;
 
         constructor(parent:HTMLElement, inspector:Inspector) {
-            super('fa-mouse-pointer', parent, inspector, 'Select a mesh in the scene');
+            super('fa', 'fa-mouse-pointer', parent, inspector, 'Select a mesh in the scene');
             
             // Create handler
             this._pickHandler = this._pickMesh.bind(this);

+ 1 - 1
inspector/src/tools/PopupTool.ts

@@ -3,7 +3,7 @@ module INSPECTOR {
     export class PopupTool extends AbstractTool {
 
         constructor(parent:HTMLElement, inspector:Inspector) {
-            super('fa-external-link-alt', parent, inspector, 'Open the inspector in a popup');
+            super('fas', 'fa-external-link-alt', parent, inspector, 'Open the inspector in a popup');
         }
 
         // Action : refresh the whole panel

+ 1 - 1
inspector/src/tools/RefreshTool.ts

@@ -3,7 +3,7 @@ module INSPECTOR {
     export class RefreshTool extends AbstractTool {
 
         constructor(parent:HTMLElement, inspector:Inspector) {
-            super('fa-sync', parent, inspector, 'Refresh the current tab');
+            super('fa', 'fa-sync', parent, inspector, 'Refresh the current tab');
         }
 
         // Action : refresh the whole panel