diff options
Diffstat (limited to 'js/panels/Materials')
4 files changed, 54 insertions, 79 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 @@ | |||
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 4e41512f..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 | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
@@ -47,12 +47,10 @@ | |||
47 | ] | 47 | ] |
48 | }, | 48 | }, |
49 | "materialInfo": { | 49 | "materialInfo": { |
50 | "module": "js/panels/Materials/materials-popup.reel", | 50 | "prototype": "js/panels/Materials/materials-popup.reel" |
51 | "name": "MaterialsPopup" | ||
52 | }, | 51 | }, |
53 | "materialsController" : { | 52 | "materialsController" : { |
54 | "module": "js/controllers/tree-controller", | 53 | "prototype": "js/components/controllers/tree-controller", |
55 | "name": "TreeController", | ||
56 | "properties" : { | 54 | "properties" : { |
57 | "branchKey" : "children", | 55 | "branchKey" : "children", |
58 | "labelKey" : "label", | 56 | "labelKey" : "label", |
@@ -66,8 +64,7 @@ | |||
66 | } | 64 | } |
67 | }, | 65 | }, |
68 | "materialsContainer" : { | 66 | "materialsContainer" : { |
69 | "module" : "js/components/treeview/treeview.reel", | 67 | "prototype" : "js/components/treeview/treeview.reel", |
70 | "name" : "Treeview", | ||
71 | "properties" : { | 68 | "properties" : { |
72 | "element" : {"#": "materials_library_tree"}, | 69 | "element" : {"#": "materials_library_tree"}, |
73 | "branchComponent" : {"@": "branch" }, | 70 | "branchComponent" : {"@": "branch" }, |
@@ -76,12 +73,10 @@ | |||
76 | } | 73 | } |
77 | }, | 74 | }, |
78 | "branch" : { | 75 | "branch" : { |
79 | "module" : "js/components/treeview/ninja-branch.reel", | 76 | "prototype" : "js/components/treeview/ninja-branch.reel[Branch]" |
80 | "name" : "Branch" | ||
81 | }, | 77 | }, |
82 | "owner": { | 78 | "owner": { |
83 | "module": "js/panels/Materials/materials-library-panel.reel", | 79 | "prototype": "js/panels/Materials/materials-library-panel.reel[MaterialsLibraryPanels]", |
84 | "name": "MaterialsLibraryPanels", | ||
85 | "properties": { | 80 | "properties": { |
86 | "element": {"#": "materials_library_panel"}, | 81 | "element": {"#": "materials_library_panel"}, |
87 | "_materialInfo": {"@": "materialInfo"} | 82 | "_materialInfo": {"@": "materialInfo"} |
@@ -93,15 +88,15 @@ | |||
93 | </head> | 88 | </head> |
94 | <body> | 89 | <body> |
95 | 90 | ||
96 | <div id="materials_library_panel" class="materials_library_panel"> | 91 | <div data-montage-id="materials_library_panel" class="materials_library_panel"> |
97 | <section id="ml_tree_holder" class="animationsLibrary"> | 92 | <section data-montage-id="ml_tree_holder" class="animationsLibrary"> |
98 | <div id="materials_library_tree"></div> | 93 | <div data-montage-id="materials_library_tree"></div> |
99 | </section> | 94 | </section> |
100 | <hr /> | 95 | <hr /> |
101 | <div id="ml_buttons"> | 96 | <div data-montage-id="ml_buttons" class="ml_buttons"> |
102 | <button id="ml_add_btn" class="nj-skinned">Add</button> | 97 | <button data-montage-id="ml_add_btn" class="nj-skinned">Add</button> |
103 | <button id="ml_copy_btn" class="nj-skinned">Copy</button> | 98 | <button data-montage-id="ml_copy_btn" class="nj-skinned">Copy</button> |
104 | <button id="ml_delete_btn" class="nj-skinned">Delete</button> | 99 | <button data-montage-id="ml_delete_btn" class="nj-skinned">Delete</button> |
105 | </div> | 100 | </div> |
106 | </div> | 101 | </div> |
107 | 102 | ||
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.css b/js/panels/Materials/materials-popup.reel/materials-popup.css index 2d339411..943d9bcb 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.css +++ b/js/panels/Materials/materials-popup.reel/materials-popup.css | |||
@@ -21,15 +21,15 @@ | |||
21 | background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.5, #1d1d1d), color-stop(0.75, #424242)); | 21 | background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.5, #1d1d1d), color-stop(0.75, #424242)); |
22 | border: none; | 22 | border: none; |
23 | height: 2px; | 23 | height: 2px; |
24 | margin: 4px 0px 4px 0px; | 24 | margin: 4px 0 4px 0; |
25 | } | 25 | } |
26 | 26 | ||
27 | #mp_title { | 27 | .mp_title { |
28 | margin: 4px 0px 0px 0px; | 28 | margin: 4px 0 0 0; |
29 | text-align: center; | 29 | text-align: center; |
30 | } | 30 | } |
31 | 31 | ||
32 | #mp_preview { | 32 | .mp_preview { |
33 | height: 100px; | 33 | height: 100px; |
34 | text-align: center; | 34 | text-align: center; |
35 | } | 35 | } |
@@ -84,12 +84,17 @@ | |||
84 | width: 27px !important; | 84 | width: 27px !important; |
85 | height: 27px !important; | 85 | height: 27px !important; |
86 | overflow:hidden !important; | 86 | overflow:hidden !important; |
87 | margin-top: -6px; | ||
88 | } | ||
89 | |||
90 | .mp_properties_list .mp_property:first-child { | ||
91 | margin-bottom: 12px; | ||
87 | } | 92 | } |
88 | 93 | ||
89 | .mp_buttons { | 94 | .mp_buttons { |
90 | clear:both; | 95 | clear:both; |
91 | float: left; | 96 | float: left; |
92 | margin: 0px -4px 0px 4px; | 97 | margin: 0 -4px 4px 4px; |
93 | width: 97%; | 98 | width: 97%; |
94 | } | 99 | } |
95 | 100 | ||
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html index ae0ee2c8..d18599d6 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.html +++ b/ |