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

Editor: Themes code clean up.

Mr.doob 12 years ago
parent
a4bb909bfa
commit
9cbb1897f5
7 changed files with 9 additions and 17 deletions
Split View Show Diff Stats
  1. 4 5
      editor/css/dark.css
  2. 0 7
      editor/css/light.css
  3. 1 1
      editor/index.html
  4. 4 4
      editor/js/Sidebar.Renderer.js
  5. BIN
      editor/themes/common/grid.png
  6. BIN
      editor/themes/darkgray/trans.png
  7. BIN
      editor/themes/default/trans.png

+ 4 - 5
editor/themes/darkgray/style.css → editor/css/dark.css
View File 

@@ -93,7 +93,7 @@ input.Number {
 
 	position: absolute;
 
 	width: 100%;
 
 	height: 32px;
 
-	background: url(trans.png);
 
+	background-color: #111;
 
 	padding: 0px;
 
 	margin: 0px;
 
 }
 
@@ -110,7 +110,7 @@ input.Number {
 
 
 		#menubar .menu .options {
 
 			padding: 5px 0px;
 
-			background: url(trans.png);
 
+			background-color: #111;
 
 			width: 140px;
 
 			border-top: solid 1px #1D1D1D;
 
 		}
 
@@ -138,7 +138,7 @@ input.Number {
 
 	top: 32px;
 
 	bottom: 0px;
 
 	width: 300px;
 
-	background: url(trans.png);
 
+	background-color: #111;
 
 	overflow: auto;
 
 }
 
 
@@ -167,7 +167,6 @@ input.Number {
 
 
 	#sidebar .Panel.Material canvas {
 
 
-		background: url(../common/grid.png);
 
 		border: solid 1px #5A5A5A;
 
 
 	}
 
@@ -186,7 +185,7 @@ input.Number {
 
 	right: 300px;
 
 	bottom: 0px;
 
 	height: 32px;
 
-	background: url(trans.png);
 
+	background-color: #111;
 
 	color: #333;
 
 }

+ 0 - 7
editor/themes/default/style.css → editor/css/light.css
View File 

@@ -138,13 +138,6 @@ input.Number {
 
 		font-size: 12px;
 
 	}
 
 
-	#sidebar .Panel.Material canvas {
 
-
 
-		/* background: url(../common/grid.png);
 
-		border: solid 1px #5A5A5A; */
 
-
 
-	}
 
-
 
 	#sidebar #outliner .type {
 
 		padding: 2px 4px;
 
 		font-size: 10px;

+ 1 - 1
editor/index.html
View File 

@@ -6,7 +6,7 @@
 
 		<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
 
 	</head>
 
 	<body>
 
-		<link id="theme" href="themes/default/style.css" rel="stylesheet" />
 
+		<link id="theme" href="css/light.css" rel="stylesheet" />
 
 
 		<script src="../build/three.min.js"></script>
 
 		<script src="../examples/js/libs/system.min.js"></script>

+ 4 - 4
editor/js/Sidebar.Renderer.js
View File 

@@ -43,13 +43,13 @@ Sidebar.Renderer = function ( editor ) {
 
 	var themeRow = new UI.Panel();
 
 	var originalColor;
 
 
-	var themeClass = new UI.Select().setOptions( ['Original', 'Dark', 'Dark+'] ).setWidth( '150px ').setColor( '#444' ).setFontSize( '12px ').onChange( function () {
 
+	var themeClass = new UI.Select().setOptions( ['Light', 'Dark', 'Dark+'] ).setWidth( '150px ').setColor( '#444' ).setFontSize( '12px ').onChange( function () {
 
 
 		var colorVal = clearColor.getValue();
 
 		switch ( this.value ) {
 
 
 			case '1':
 
-				themeLink.href = 'themes/darkgray/style.css';
 
+				themeLink.href = 'css/dark.css';
 
 
 				if ( originalColor && originalColor != colorVal ) {
 
 
@@ -60,7 +60,7 @@ Sidebar.Renderer = function ( editor ) {
 
 				break;
 
 
 			case '2':
 
-				themeLink.href =  'themes/darkgray/style.css'
 
+				themeLink.href =  'css/dark.css'
 
 
 				if ( colorVal != '#333333' ) {
 
 
@@ -72,7 +72,7 @@ Sidebar.Renderer = function ( editor ) {
 
 				break;
 
 
 			default:
 
-				themeLink.href = 'themes/default/style.css';
 
+				themeLink.href = 'css/light.css';
 
 
 				if ( originalColor && originalColor != colorVal ) {

BIN
editor/themes/common/grid.png
View File


BIN
editor/themes/darkgray/trans.png
View File


BIN
editor/themes/default/trans.png
View File