Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js
author: hwc487 2012-05-11 13:52:55 -0700
committer: hwc487 2012-05-11 13:52:55 -0700
commit: 137bfc9d4c41cc918d969565bec28a834fe10472 (patch)
tree: e9fa109fc65218f45e386df48b713ff5858f3d62 /js/panels/Materials/materials-library-panel.reel
parent: d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff)
parent: 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff)
download: ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz
2 files changed, 25 insertions, 34 deletions
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
index fe88ebf6..bed3acfe 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
@@ -5,43 +5,34 @@
 </copyright> */
 .materials_library_panel hr {
-  float: left;
+    float: left;
-  clear: both;
+    clear: both;
-  width: 100%;
+    width: 100%;
-  display: block;
+    display: block;
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.5, #1d1d1d), color-stop(0.75, #424242));
+    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.5, #1d1d1d), color-stop(0.75, #424242));
-  border: none;
+    border: none;
-  height: 2px;
+    height: 2px;
-  margin: 4px 0px 4px 0px;
+    margin: 4px 0 4px 0;
 }
-#ml_buttons {
+.ml_buttons {
    clear:both;
    float: left;
-    margin: 0px -4px 0px 4px;
+    margin: 0 -4px 0 4px;
    width: 97%;
 }
-#ml_buttons .nj-skinned{
+.ml_buttons .nj-skinned {
-  height: 22px;
+    height: 22px;
-  overflow: hidden;
+    overflow: hidden;
-  display: block;
+    display: block;
-  cursor: pointer;
+    cursor: pointer;
-  margin: 0px 1px;
+    margin: 0 1px;
-}
-#ml_add_btn {
-    float: left;
-    width: 60px;
-}
-#ml_copy_btn {
    float: left;
    width: 60px;
 }
-#ml_delete_btn {
+.ml_buttons .nj-skinned:last-child {
    float: right;
-    width: 60px;
 }
 \ No newline at end of file
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
index 741ff6aa..b5d7a869 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
@@ -50,7 +50,7 @@
                "prototype": "js/panels/Materials/materials-popup.reel"
            },
            "materialsController" : {
-                "prototype": "js/controllers/tree-controller",
+                "prototype": "js/components/controllers/tree-controller",
                "properties" : {
                    "branchKey" : "children",
                    "labelKey" : "label",
@@ -88,15 +88,15 @@
        </head>
        <body>
-        <div id="materials_library_panel" class="materials_library_panel">
+        <div data-montage-id="materials_library_panel" class="materials_library_panel">
-            <section id="ml_tree_holder" class="animationsLibrary">
+            <section data-montage-id="ml_tree_holder" class="animationsLibrary">
-                <div id="materials_library_tree"></div>
+                <div data-montage-id="materials_library_tree"></div>
            </section>
            <hr />
-            <div id="ml_buttons">
+            <div data-montage-id="ml_buttons" class="ml_buttons">
-                <button id="ml_add_btn" class="nj-skinned">Add</button>
+                <button data-montage-id="ml_add_btn" class="nj-skinned">Add</button>
-                <button id="ml_copy_btn" class="nj-skinned">Copy</button>
+                <button data-montage-id="ml_copy_btn" class="nj-skinned">Copy</button>
-                <button id="ml_delete_btn" class="nj-skinned">Delete</button>
+                <button data-montage-id="ml_delete_btn" class="nj-skinned">Delete</button>
            </div>
        </div>
author	hwc487	2012-05-11 13:52:55 -0700
committer	hwc487	2012-05-11 13:52:55 -0700
commit	137bfc9d4c41cc918d969565bec28a834fe10472 (patch)
tree	e9fa109fc65218f45e386df48b713ff5858f3d62 /js/panels/Materials/materials-library-panel.reel
parent	d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff)
parent	27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff)
download	ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz

diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css index fe88ebf6..bed3acfe 100755 --- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css +++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
@@ -5,43 +5,34 @@
5	</copyright> */	5	</copyright> */
6		6
7	.materials_library_panel hr {	7	.materials_library_panel hr {
8	float: left;	8	float: left;
9	clear: both;	9	clear: both;
10	width: 100%;	10	width: 100%;
11	display: block;	11	display: block;
12	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.5, #1d1d1d), color-stop(0.75, #424242));	12	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.5, #1d1d1d), color-stop(0.75, #424242));
13	border: none;	13	border: none;
14	height: 2px;	14	height: 2px;
15	margin: 4px 0px 4px 0px;	15	margin: 4px 0 4px 0;
16	}	16	}
17		17
18		18
19	#ml_buttons {	19	.ml_buttons {
20	clear:both;	20	clear:both;
21	float: left;	21	float: left;
22	margin: 0px -4px 0px 4px;	22	margin: 0 -4px 0 4px;
23	width: 97%;	23	width: 97%;
24	}	24	}
25		25
26	#ml_buttons .nj-skinned{	26	.ml_buttons .nj-skinned {
27	height: 22px;	27	height: 22px;
28	overflow: hidden;	28	overflow: hidden;
29	display: block;	29	display: block;
30	cursor: pointer;	30	cursor: pointer;
31	margin: 0px 1px;	31	margin: 0 1px;
32	}
33
34	#ml_add_btn {
35	float: left;
36	width: 60px;
37	}
38
39	#ml_copy_btn {
40	float: left;	32	float: left;
41	width: 60px;	33	width: 60px;
42	}	34	}
43		35
44	#ml_delete_btn {	36	.ml_buttons .nj-skinned:last-child {
45	float: right;	37	float: right;
46	width: 60px;
47	} \ No newline at end of file	38	} \ No newline at end of file


diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html index 741ff6aa..b5d7a869 100755 --- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html +++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
@@ -50,7 +50,7 @@
50	"prototype": "js/panels/Materials/materials-popup.reel"	50	"prototype": "js/panels/Materials/materials-popup.reel"
51	},	51	},
52	"materialsController" : {	52	"materialsController" : {
53	"prototype": "js/controllers/tree-controller",	53	"prototype": "js/components/controllers/tree-controller",
54	"properties" : {	54	"properties" : {
55	"branchKey" : "children",	55	"branchKey" : "children",
56	"labelKey" : "label",	56	"labelKey" : "label",
@@ -88,15 +88,15 @@
88	</head>	88	</head>
89	<body>	89	<body>
90		90
91	<div id="materials_library_panel" class="materials_library_panel">	91	<div data-montage-id="materials_library_panel" class="materials_library_panel">
92	<section id="ml_tree_holder" class="animationsLibrary">	92	<section data-montage-id="ml_tree_holder" class="animationsLibrary">
93	<div id="materials_library_tree"></div>	93	<div data-montage-id="materials_library_tree"></div>
94	</section>	94	</section>
95	<hr />	95	<hr />
96	<div id="ml_buttons">	96	<div data-montage-id="ml_buttons" class="ml_buttons">
97	<button id="ml_add_btn" class="nj-skinned">Add</button>	97	<button data-montage-id="ml_add_btn" class="nj-skinned">Add</button>
98	<button id="ml_copy_btn" class="nj-skinned">Copy</button>	98	<button data-montage-id="ml_copy_btn" class="nj-skinned">Copy</button>
99	<button id="ml_delete_btn" class="nj-skinned">Delete</button>	99	<button data-montage-id="ml_delete_btn" class="nj-skinned">Delete</button>
100	</div>	100	</div>
101	</div>	101	</div>
102		102