aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-04-30 16:04:13 -0700
committerNivesh Rajbhandari2012-04-30 16:04:13 -0700
commit6b67b498b3b1eec82e7bb7f34261e2c390506616 (patch)
tree3874b52284763c066f040a8f594bde8aee2cd20e /js/panels/Materials
parente46d154b7821741618bf999c9216761ea36ad003 (diff)
downloadninja-6b67b498b3b1eec82e7bb7f34261e2c390506616.tar.gz
Updating id to data-montage-id (and associated CSS, if necessary) in some of our custom ui controls (such as hottest, slider, etc.), materials panels and three-d section of the PI.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/panels/Materials')
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.css43
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.html14
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.css15
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.html26
4 files changed, 42 insertions, 56 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 741ff6aa..7fc48a55 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
@@ -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
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 9fdbc00d..d18599d6 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.html
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.html
@@ -88,29 +88,19 @@
88 </head> 88 </head>
89 89
90 <body> 90 <body>
91 91 <div data-montage-id="materials_popup" class="materials_popup">
92 <div id="materials_popup" class="materials_popup"> 92 <div data-montage-id="mp_title" class="mp_title">Material Name</div>
93 <div id="mp_title">Material Name</div>
94
95 <hr /> 93 <hr />
96 94 <div data-montage-id="mp_preview" class="mp_preview">Preview Pane</div>
97 <div id="mp_preview">Preview Pane</div>
98
99 <hr /> 95 <hr />
100 96 <div data-montage-id="mp_properties_list" class="mp_properties_list">
101 <div id="mp_properties_list" class="mp_properties_list"> 97 <div data-montage-id="mp_property" class="mp_property"></div>
102 <div id="mp_property" class="mp_property"></div>
103 </div> 98 </div>
104
105 <hr /> 99 <hr />
106 100 <div data-montage-id="mp_buttons" class="mp_buttons">
107 <div id="mp_buttons" class="mp_buttons"> 101 <button data-montage-id="mp_cancel_btn" class="mp_cancel_btn nj-skinned"></button>
108 <button id="mp_cancel_btn" class="mp_cancel_btn nj-skinned"></button> 102 <button data-montage-id="mp_ok_btn" class="mp_ok_btn nj-skinned"></button>
109 <button id="mp_ok_btn" class="mp_ok_btn nj-skinned"></button>
110 </div> 103 </div>
111
112 </div> 104 </div>
113
114 </body> 105 </body>
115
116</html> \ No newline at end of file 106</html> \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 12:44:39 +0000