aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-05-18 16:12:30 -0700
committerNivesh Rajbhandari2012-05-18 16:12:30 -0700
commitf30e5613e37ec6858fe4b56d289fafb9f1b9b9f8 (patch)
treec313a5e0b4dc5a4d7b5cd44fe0969b325f59ecad
parent3e22b0940bb7752e292e485d8a393f215cae05de (diff)
downloadninja-f30e5613e37ec6858fe4b56d289fafb9f1b9b9f8.tar.gz
Fixing button controls in the Properties Panel for changes in montage v.10 drawing.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
-rwxr-xr-xjs/panels/properties.reel/properties.css30
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html10
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.js3
3 files changed, 33 insertions, 10 deletions
diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css
index 5306eb5b..3166a1ff 100755
--- a/js/panels/properties.reel/properties.css
+++ b/js/panels/properties.reel/properties.css
@@ -303,4 +303,34 @@ input label {
303.propertiesPanel .rotation .fieldRow { 303.propertiesPanel .rotation .fieldRow {
304 -webkit-box-flex:0; 304 -webkit-box-flex:0;
305 width:45px; 305 width:45px;
306}
307
308.propertiesPanel div.montage-button:disabled {
309 opacity: 0.4;
310}
311
312.propertiesPanel div.montage-button {
313 font-size: 9px;
314 cursor: pointer;
315 display: block;
316 margin: -3px 0 0 -12px;
317 padding: 4px;
318 border: 1px #313131 solid;
319 background-color: #474747;
320 background-image: -webkit-linear-gradient(top, #505050 0%, #3c3c3c 100%);
321 border-radius: 4px;
322 color: white;
323 text-transform: uppercase;
324 cursor: pointer;
325 text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
326 width: 18px;
327 height: 14px;
328}
329
330.propertiesPanel div.montage-button:active {
331 background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #505050 100%);
332}
333
334.propertiesPanel div.montage-button:hover {
335 -webkit-box-shadow: 0px 0px 3px #b4b4b4;
306} \ No newline at end of file 336} \ No newline at end of file
diff --git a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html
index bdcbff7f..c3af0668 100755
--- a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html
+++ b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html
@@ -22,10 +22,7 @@
22 "element": { "#": "slotElement" } 22 "element": { "#": "slotElement" }
23 }, 23 },
24 "bindings": { 24 "bindings": {
25 "content" : { 25 "content": {"<-": "@owner.content"}
26 "boundObject": {"@": "owner"},
27 "boundObjectPropertyPath": "content"
28 }
29 } 26 }
30 }, 27 },
31 "slot2": { 28 "slot2": {
@@ -34,10 +31,7 @@
34 "element": { "#": "slotElement2" } 31 "element": { "#": "slotElement2" }
35 }, 32 },
36 "bindings": { 33 "bindings": {
37 "content" : { 34 "content": {"<-": "@owner.content2"}
38 "boundObject": {"@": "owner"},
39 "boundObjectPropertyPath": "content2"
40 }
41 } 35 }
42 } 36 }
43 } 37 }
diff --git a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.js b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.js
index 4c5c80d7..2f81aa2e 100755
--- a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.js
+++ b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.js
@@ -44,8 +44,7 @@ exports.DualRow = Montage.create(Component, {
44 } 44 }
45 if(this.label2 !== null) { 45 if(this.label2 !== null) {
46 if(this.content2.type === "button") { 46 if(this.content2.type === "button") {
47 this.content2.element = document.createElement("button"); 47 this.content2.label = this.label2;
48 this.content2.element.classList.add("nj-skinned");
49 this.element.getElementsByClassName("lbl")[1].style.display = "none"; 48 this.element.getElementsByClassName("lbl")[1].style.display = "none";
50 } else { 49 } else {
51 this.element.getElementsByClassName("lbl")[1].innerHTML = this.label2 + ":"; 50 this.element.getElementsByClassName("lbl")[1].innerHTML = this.label2 + ":";