Browse Source

reorganize css

Tom SPIRA 6 years ago
parent
commit
900312d84e

+ 37 - 37
bin/cdb.css

@@ -281,34 +281,21 @@
   min-width: 500px;
   min-height: 200px;
 }
-.floating-thead {
+.cdb .floating-thead {
   position: fixed;
   background-color: #222;
 }
-.floating-thead th:first-child {
+.cdb .floating-thead th:first-child {
   border-left: 1px solid #222;
 }
-.floating-thead th {
+.cdb .floating-thead th {
   overflow: hidden;
   color: #ddd;
   padding: 1px 10px;
   border-left: 1px solid #555;
   border-bottom: 2px solid #666;
 }
-body.fullScreenMode .lm_content,
-body.fullScreenMode .lm_header,
-body.fullScreenMode .lm_splitter {
-  display: none;
-}
-body.fullScreenMode .lm_content.fullScreen {
-  display: block;
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 100% !important;
-  height: 100% !important;
-}
-.content-modal {
+.cdb .content-modal {
   width: 350px;
   min-height: 300px;
   margin: auto;
@@ -317,48 +304,61 @@ body.fullScreenMode .lm_content.fullScreen {
   border: 2px solid #555;
   color: #dadada;
 }
-.content-modal form {
+.cdb .content-modal form {
   font-size: 14px;
 }
-.content-modal form input[type=text],
-.content-modal form input[type=submit],
-.content-modal form select {
+.cdb .content-modal form input[type=text],
+.cdb .content-modal form input[type=submit],
+.cdb .content-modal form select {
   height: 28px;
 }
-.content-modal form .t_int .disp,
-.content-modal form .t_float .disp {
+.cdb .content-modal form .t_int .disp,
+.cdb .content-modal form .t_float .disp {
   display: block;
 }
-.content-modal form .t_string .localizable {
+.cdb .content-modal form .t_string .localizable {
   display: block;
 }
-.content-modal form .t_enum .values,
-.content-modal form .t_flags .values {
+.cdb .content-modal form .t_enum .values,
+.cdb .content-modal form .t_flags .values {
   display: block;
 }
-.content-modal form .t_ref .sheet {
+.cdb .content-modal form .t_ref .sheet {
   display: block;
 }
-.content-modal form .t_layer .sheet {
+.cdb .content-modal form .t_layer .sheet {
   display: block;
 }
-.content-modal form .t_custom .custom {
+.cdb .content-modal form .t_custom .custom {
   display: block;
 }
-.content-modal form .values,
-.content-modal form .sheet,
-.content-modal form .custom,
-.content-modal form .disp,
-.content-modal form .localizable {
+.cdb .content-modal form .values,
+.cdb .content-modal form .sheet,
+.cdb .content-modal form .custom,
+.cdb .content-modal form .disp,
+.cdb .content-modal form .localizable {
   display: none;
 }
-.content-modal form.edit input.create {
+.cdb .content-modal form.edit input.create {
   display: none;
 }
-.content-modal form.create input.edit {
+.cdb .content-modal form.create input.edit {
   display: none;
 }
-.content-modal #errorModal {
+.cdb .content-modal #errorModal {
   color: red;
   text-align: center;
 }
+body.fullScreenMode .lm_content,
+body.fullScreenMode .lm_header,
+body.fullScreenMode .lm_splitter {
+  display: none;
+}
+body.fullScreenMode .lm_content.fullScreen {
+  display: block;
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100% !important;
+  height: 100% !important;
+}

+ 57 - 57
bin/cdb.less

@@ -320,22 +320,67 @@
 		}
 
 	}
-}
 
-.floating-thead {
-	position: fixed;
-	background-color : #222;
+	.floating-thead {
+		position: fixed;
+		background-color : #222;
+
+		th:first-child {
+			border-left: 1px solid #222;
+		}
 
-	th:first-child {
-		border-left: 1px solid #222;
+		th {
+			overflow: hidden;
+			color : #ddd;
+			padding: 1px 10px;
+			border-left: 1px solid #555;
+			border-bottom: 2px solid #666;
+		}
 	}
 
-	th {
-		overflow: hidden;
-		color : #ddd;
-		padding: 1px 10px;
-		border-left: 1px solid #555;
-		border-bottom: 2px solid #666;
+	.content-modal {
+		width: 350px;
+		min-height: 300px;
+		margin: auto;
+		padding: 15px;
+		background: #292929;
+		border: 2px solid #555;
+		color: #dadada;
+
+		form {
+			font-size: 14px;
+			input[type=text], input[type=submit], select {
+				height: 28px;
+			}
+			.t_int, .t_float {
+				.disp { display : block; }
+			}
+			.t_string {
+				.localizable { display : block; }
+			}
+			.t_enum .values, .t_flags .values { display : block; }
+			.t_ref .sheet { display : block; }
+			.t_layer .sheet { display : block; }
+			.t_custom .custom { display : block; }
+			.values, .sheet, .custom, .disp, .localizable  { display : none; }
+
+		}
+
+		form.edit {
+			input.create {
+				display: none;
+			}
+		}
+		form.create {
+			input.edit {
+				display: none;
+			}
+		}
+
+		#errorModal {
+			color: red;
+			text-align: center;
+		}
 	}
 }
 
@@ -352,49 +397,4 @@ body.fullScreenMode {
 		width : 100% !important;
 		height: 100% !important;
 	}
-}
-
-.content-modal {
-	width: 350px;
-	min-height: 300px;
-	margin: auto;
-	padding: 15px;
-	background: #292929;
-	border: 2px solid #555;
-	color: #dadada;
-
-	form {
-		font-size: 14px;
-		input[type=text], input[type=submit], select {
-			height: 28px;
-		}
-		.t_int, .t_float {
-			.disp { display : block; }
-		}
-		.t_string {
-			.localizable { display : block; }
-		}
-		.t_enum .values, .t_flags .values { display : block; }
-		.t_ref .sheet { display : block; }
-		.t_layer .sheet { display : block; }
-		.t_custom .custom { display : block; }
-		.values, .sheet, .custom, .disp, .localizable  { display : none; }
-	
-	}
-
-	form.edit {
-		input.create {
-			display: none;
-		}
-	}
-	form.create {
-		input.edit {
-			display: none;
-		}
-	}
-	
-	#errorModal {
-		color: red;
-		text-align: center;
-	}
 }

+ 3 - 3
bin/style.css

@@ -275,7 +275,7 @@ input[type=checkbox]:checked:after {
 .hide-range input[type=text]:active {
   border-color: #444;
 }
-.scene {
+.heaps-scene {
   flex: 1;
 }
 .flex {
@@ -412,13 +412,13 @@ input[type=checkbox]:checked:after {
 .tabs-header > div:hover {
   background-color: #282828;
 }
-.tab {
+.tabs-header .tab {
   max-height: 100%;
   display: flex;
   flex-direction: column;
   position: absolute;
 }
-.expand {
+.tabs-header .expand {
   width: 100%;
   height: 100%;
 }

+ 11 - 13
bin/style.less

@@ -295,7 +295,7 @@ input[type=checkbox] {
 	}
 }
 
-.scene {
+.heaps-scene {
 	flex: 1;
 }
 
@@ -442,19 +442,17 @@ input[type=checkbox] {
 			background-color : #282828;
 		}
 	}
+	.tab {
+		max-height: 100%;
+		display: flex;
+		flex-direction: column;
+		position: absolute;
+	}
 
-}
-
-.tab {
-	max-height: 100%;
-	display: flex;
-	flex-direction: column;
-	position: absolute;
-}
-
-.expand {
-	width: 100%;
-	height: 100%;
+	.expand {
+		width: 100%;
+		height: 100%;
+	}
 }
 
 .searchBox {

+ 1 - 1
hide/comp/SceneEditor.hx

@@ -121,7 +121,7 @@ class SceneEditor {
 		tree.async = false;
 		tree.autoOpenNodes = false;
 
-		var sceneEl = new Element('<div class="scene"></div>');
+		var sceneEl = new Element('<div class="heaps-scene"></div>');
 		scene = new hide.comp.Scene(view.config, null, sceneEl);
 		scene.editor = this;
 		scene.onReady = onSceneReady;

+ 2 - 5
hide/comp/cdb/Editor.hx

@@ -62,9 +62,6 @@ class Editor extends Component {
 			if( cell != null && cell.isTextInput() && !e.ctrlKey )
 				cell.edit();
 		});
-		element.on("resize", function(e) {
-			refresh();
-		});
 		keys = new hide.ui.Keys(element);
 		keys.addListener(onKey);
 		keys.register("search", function() {
@@ -587,12 +584,12 @@ class Editor extends Component {
 				editColumn(table.sheet, col);
 			}
 		});
-		
+
 		menu.push({ label : "Add Column", click : function () {
 				newColumn(table.sheet, indexColumn);
 			}
 		});
-			
+
 		menu.push({ label: "sep", isSeparator: true });
 		menu.push({ label : "Move Left", enabled:  (indexColumn > 0), click : function () {
 				moveColumnLeft(table.sheet, indexColumn);

+ 4 - 4
hide/comp/cdb/ModalColumnForm.hx

@@ -48,14 +48,14 @@ class ModalColumnForm extends Modal {
                 <option value="custom">Custom Type</option>
             </select>
             <br /><br />
-            
+
 			<div id="col_options">
 				<div class="values">
                     Possible Values
                     <br />
                     <input type="text" name="values" name="vals"/>
                     <br /><br />
-                </div> 
+                </div>
 
 				<div class="sheet">
                     Sheet
@@ -65,7 +65,7 @@ class ModalColumnForm extends Modal {
                 </div>
 
 				<div class="disp">
-                    Display 
+                    Display
                     <br />
                     <select name="display">
                     <option value="0">Default</option>
@@ -92,7 +92,7 @@ class ModalColumnForm extends Modal {
 
 			</form>').appendTo(contentModal);
 
-        var sheets = form.find("[name=sheet]");
+		var sheets = form.find("[name=sheet]");
 		sheets.empty();
 		for( i in 0...base.sheets.length ) {
 			var s = base.sheets[i];

+ 2 - 1
hide/comp/cdb/Table.hx

@@ -44,7 +44,7 @@ class Table extends Component {
 		}
 	}
 
-	function cloneTableHead() {
+	public function cloneTableHead() {
 		var target = J('.head');
 		if (target.length == 0) {
 			trace("Fail clone table head");
@@ -162,6 +162,7 @@ class Table extends Component {
 		}
 
 		cols.ready(cloneTableHead);
+		cols.on("resize", cloneTableHead);
 	}
 
 	function makeSeparator( sindex : Int, colCount : Int ) {

+ 2 - 2
hide/view/DomKit.hx

@@ -38,11 +38,11 @@ class DomKit extends FileView {
 					<div class="html"></div>
 					<div class="cssErrors"></div>
 				</div>
-				<div class="scene">
+				<div class="heaps-scene">
 				</div>
 			</div>
 		');
-		scene = new hide.comp.Scene(config,null,element.find(".scene"));
+		scene = new hide.comp.Scene(config,null,element.find(".heaps-scene"));
 		scene.onResize = onSceneResize;
 		scene.onReady = sync;
 		editor = new hide.comp.CodeEditor(uiElt.html, "xml", element.find(".html"));

+ 2 - 2
hide/view/FXEditor.hx

@@ -194,7 +194,7 @@ class FXEditor extends FileView {
 				<div class="toolbar"></div>
 				<div class="flex-elt">
 					<div class="flex vertical">
-						<div class="flex scene"></div>
+						<div class="flex heaps-scene"></div>
 						<div class="fx-animpanel">
 							<div class="top-bar">
 								<div class="timeline">
@@ -230,7 +230,7 @@ class FXEditor extends FileView {
 		sceneEditor = new FXSceneEditor(this, data);
 		element.find(".hide-scene-tree").first().append(sceneEditor.tree.element);
 		element.find(".hide-scroll").first().append(sceneEditor.properties.element);
-		element.find(".scene").first().append(sceneEditor.scene.element);
+		element.find(".heaps-scene").first().append(sceneEditor.scene.element);
 		element.resize(function(e) {
 			refreshTimeline(false);
 			rebuildAnimPanel();

+ 2 - 2
hide/view/Image.hx

@@ -40,7 +40,7 @@ class Image extends FileView {
 		element.html('
 			<div class="flex vertical">
 				<div class="toolbar"></div>
-				<div class="scene">
+				<div class="heaps-scene">
 				</div>
 			</div>
 		');
@@ -53,7 +53,7 @@ class Image extends FileView {
 				if( b ) channelSelect.channels |= 1 << i;
 			});
 		}
-		scene = new hide.comp.Scene(config, null, element.find(".scene"));
+		scene = new hide.comp.Scene(config, null, element.find(".heaps-scene"));
 		scene.onReady = function() {
 			scene.loadTexture(state.path, state.path, function(t) {
 				bmp = new h2d.Bitmap(h2d.Tile.fromTexture(t), scene.s2d);

+ 2 - 2
hide/view/Model.hx

@@ -63,7 +63,7 @@ class Model extends FileView {
 			<div class="flex vertical">
 				<div class="toolbar"></div>
 				<div class="flex-elt">
-					<div class="scene">
+					<div class="heaps-scene">
 						<div class="hide-scroll hide-scene-layer">
 							<div class="tree"></div>
 						</div>
@@ -133,7 +133,7 @@ class Model extends FileView {
 
 		element.find(".hide-scene-tree").first().append(sceneEditor.tree.element);
 		element.find(".props").first().append(sceneEditor.properties.element);
-		element.find(".scene").first().append(sceneEditor.scene.element);
+		element.find(".heaps-scene").first().append(sceneEditor.scene.element);
 		sceneEditor.tree.element.addClass("small");
 
 		element.find("input[value=Export]").click(function(_) {

+ 2 - 2
hide/view/Particles3D.hx

@@ -18,13 +18,13 @@ class Particles3D extends FileView {
 	override function onDisplay() {
 		element.html('
 			<div class="flex-elt">
-				<div class="scene"></div>
+				<div class="heaps-scene"></div>
 				<div class="props"></div>
 			</div>
 		');
 		properties = new hide.comp.PropsEditor(undo, null, element.find(".props"));
 		properties.saveDisplayKey = "particles3D";
-		scene = new hide.comp.Scene(config, null,element.find(".scene"));
+		scene = new hide.comp.Scene(config, null,element.find(".heaps-scene"));
 		scene.onReady = init;
 		scene.onUpdate = update;
 	}

+ 1 - 1
hide/view/Prefab.hx

@@ -78,7 +78,7 @@ class Prefab extends FileView {
 			<div class="flex vertical">
 				<div class="toolbar"></div>
 				<div class="flex-elt">
-					<div class="scene">
+					<div class="heaps-scene">
 					</div>
 					<div class="tabs">
 						<div class="tab expand" name="Scene" icon="sitemap">