aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials/materials-popup.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Materials/materials-popup.reel')
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.css15
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.html44
2 files changed, 24 insertions, 35 deletions
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/js/panels/Materials/materials-popup.reel/materials-popup.html
@@ -14,32 +14,28 @@
14 <script type="text/montage-serialization"> 14 <script type="text/montage-serialization">
15 { 15 {
16 "okButton": { 16 "okButton": {
17 "module": "montage/ui/button.reel", 17 "prototype": "montage/ui/button.reel",
18 "name": "Button",
19 "properties": { 18 "properties": {
20 "element": {"#": "mp_ok_btn"}, 19 "element": {"#": "mp_ok_btn"},
21 "label": "OK" 20 "label": "OK"
22 } 21 }
23 }, 22 },
24 "cancelButton": { 23 "cancelButton": {
25 "module": "montage/ui/button.reel", 24 "prototype": "montage/ui/button.reel",
26 "name": "Button",
27 "properties": { 25 "properties": {
28 "element": {"#": "mp_cancel_btn"}, 26 "element": {"#": "mp_cancel_btn"},
29 "label": "Cancel" 27 "label": "Cancel"
30 } 28 }
31 }, 29 },
32 "eventDelegator": { 30 "eventDelegator": {
33 "module": "montage/core/event/action-event-listener", 31 "prototype": "montage/core/event/action-event-listener",
34 "name": "ActionEventListener",
35 "properties": { 32 "properties": {
36 "handler": {"@": "owner"}, 33 "handler": {"@": "owner"},
37 "action": "updatePreview" 34 "action": "updatePreview"
38 } 35 }
39 }, 36 },
40 "propControl1": { 37 "propControl1": {
41 "module": "js/components/ui/property-control.reel", 38 "prototype": "js/components/ui/property-control.reel",
42 "name": "PropertyControl",
43 "properties": { 39 "properties": {
44 "element": {"#": "mp_property"} 40 "element": {"#": "mp_property"}
45 }, 41 },
@@ -64,8 +60,7 @@
64 ] 60 ]
65 }, 61 },
66 "materialsProperties": { 62 "materialsProperties": {
67 "module": "montage/ui/repetition.reel", 63 "prototype": "montage/ui/repetition.reel",
68 "name": "Repetition",
69 "properties": { 64 "properties": {
70 "element": {"#": "mp_properties_list"} 65 "element": {"#": "mp_properties_list"}
71 }, 66 },
@@ -78,8 +73,7 @@
78 } 73 }
79 }, 74 },
80 "owner": { 75 "owner": {
81 "module": "js/panels/Materials/materials-popup.reel", 76 "prototype": "js/panels/Materials/materials-popup.reel",
82 "name": "MaterialsPopup",
83 "properties": { 77 "properties": {
84 "materialsProperties": {"@": "materialsProperties"}, 78 "materialsProperties": {"@": "materialsProperties"},
85 "element": {"#": "materials_popup"}, 79 "element": {"#": "materials_popup"},
@@ -94,29 +88,19 @@
94 </head> 88 </head>
95 89
96 <body> 90 <body>
97 91 <div data-montage-id="materials_popup" class="materials_popup">
98 <div id="materials_popup" class="materials_popup"> 92 <div data-montage-id="mp_title" class="mp_title">Material Name</div>
99 <div id="mp_title">Material Name</div>
100
101 <hr /> 93 <hr />
102 94 <div data-montage-id="mp_preview" class="mp_preview">Preview Pane</div>
103 <div id="mp_preview">Preview Pane</div>
104
105 <hr /> 95 <hr />
106 96 <div data-montage-id="mp_properties_list" class="mp_properties_list">
107 <div id="mp_properties_list" class="mp_properties_list"> 97 <div data-montage-id="mp_property" class="mp_property"></div>
108 <div id="mp_property" class="mp_property"></div>
109 </div> 98 </div>
110
111 <hr /> 99 <hr />
112 100 <div data-montage-id="mp_buttons" class="mp_buttons">
113 <div id="mp_buttons" class="mp_buttons"> 101 <button data-montage-id="mp_cancel_btn" class="mp_cancel_btn nj-skinned"></button>
114 <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>
115 <button id="mp_ok_btn" class="mp_ok_btn nj-skinned"></button>
116 </div> 103 </div>
117
118 </div> 104 </div>
119
120 </body> 105 </body>
121
122</html> \ No newline at end of file 106</html> \ No newline at end of file