Home Explore Help
Sign In
javascript
/
three.js
mirror of https://github.com/tazdij/three.js.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge remote-tracking branch 'alteredq/dev' into dev

Mr.doob 12 years ago
parent
fb3f2b4e13 fe902e553f
commit
9d9722564c
2 changed files with 14 additions and 10 deletions
Unified View Show Diff Stats
  1. 12 10
      editor/index.html
  2. 2 0
      editor/js/ui/Viewport.js

+ 12 - 10
editor/index.html
View File 

@@ -15,6 +15,7 @@
 
 				border-top: 1px solid #ccc;
 
 				border-top: 1px solid #ccc;
 
 			}
 
 			}
 
 
 
+			.hideFocus:focus { outline: 0 }
 
 		</style>
 
 		</style>
 
 	</head>
 
 	</head>
 
 	<body>
 
 	<body>
 
@@ -82,6 +83,17 @@
 
 
 
 			//
 
 			//
 
 
 
+			var menubar = new Menubar( signals );
 
+			menubar.setWidth( '100%' );
 
+			menubar.setHeight( '32px' );
 
+			document.body.appendChild( menubar.dom );
 
+
 
+			var sidebar = new Sidebar( signals );
 
+			sidebar.setLeft( '-webkit-calc(100% - 300px)', '-moz-calc(100% - 300px)', 'calc(100% - 300px)' );
 
+			sidebar.setTop( '32px' );
 
+			sidebar.setHeight( '-webkit-calc(100% - 32px)', '-moz-calc(100% - 32px)', 'calc(100% - 32px)' );
 
+			document.body.appendChild( sidebar.dom );
 
+
 
 			var viewport = new Viewport( signals );
 
 			var viewport = new Viewport( signals );
 
 			viewport.setTop( '32px' );
 
 			viewport.setTop( '32px' );
 
 			viewport.setWidth( '-webkit-calc(100% - 300px)', '-moz-calc(100% - 300px)', 'calc(100% - 300px)' );
 
 			viewport.setWidth( '-webkit-calc(100% - 300px)', '-moz-calc(100% - 300px)', 'calc(100% - 300px)' );
 
@@ -93,16 +105,6 @@
 
 
 
 			viewport.dom.focus();
 
 			viewport.dom.focus();
 
 
 
-			var menubar = new Menubar( signals );
 
-			menubar.setWidth( '100%' );
 
-			menubar.setHeight( '32px' );
 
-			document.body.appendChild( menubar.dom );
 
-
 
-			var sidebar = new Sidebar( signals );
 
-			sidebar.setLeft( '-webkit-calc(100% - 300px)', '-moz-calc(100% - 300px)', 'calc(100% - 300px)' );
 
-			sidebar.setTop( '32px' );
 
-			sidebar.setHeight( '-webkit-calc(100% - 32px)', '-moz-calc(100% - 32px)', 'calc(100% - 32px)' );
 
-			document.body.appendChild( sidebar.dom );
 
 
 
 			document.addEventListener( 'drop', function ( event ) {
 
 			document.addEventListener( 'drop', function ( event ) {

+ 2 - 0
editor/js/ui/Viewport.js
View File 

@@ -499,6 +499,8 @@ var Viewport = function ( signals ) {
 
 	container.dom.tabIndex = 1;
 
 	container.dom.tabIndex = 1;
 
 	container.dom.addEventListener( 'keydown', onKeyDown, false );
 
 	container.dom.addEventListener( 'keydown', onKeyDown, false );
 
 
 
+	container.dom.className = "hideFocus";
 
+
 
 	//
 
 	//
 
 
 
 	function updateMaterials( root ) {
 
 	function updateMaterials( root ) {