aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-21 14:33:01 -0700
committerArmen Kesablyan2012-06-21 14:33:01 -0700
commit9fe9bc495af74d963fa7061d4d1a479720133a56 (patch)
treeeca4b0d785ad28483904682b7fdfdb9686fc3d1a /js/panels/properties.reel
parentfc818d31de267d2b77fda3b3029ad38d48698be8 (diff)
parentc411f76d89c543837548085ff468fee0fb4f2ff9 (diff)
downloadninja-9fe9bc495af74d963fa7061d4d1a479720133a56.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/panels/properties.reel')
-rwxr-xr-xjs/panels/properties.reel/properties.css10
-rwxr-xr-xjs/panels/properties.reel/properties.js1
2 files changed, 10 insertions, 1 deletions
diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css
index 84f52ed4..d1aa750a 100755
--- a/js/panels/properties.reel/properties.css
+++ b/js/panels/properties.reel/properties.css
@@ -239,8 +239,9 @@ padding-right:6px;
239} 239}
240 240
241.propertiesPanel .colortoolbar div { 241.propertiesPanel .colortoolbar div {
242 margin: 0px 10px 0px 20px; 242 margin: 0px 5px 0px 10px;
243 clear:none; 243 clear:none;
244 float: left;
244} 245}
245 246
246/* color select */ 247/* color select */
@@ -250,6 +251,13 @@ padding-right:6px;
250 clear:none; 251 clear:none;
251} 252}
252 253
254.propertiesPanel .colortoolbar .chipContainer {
255 margin-top: 2px;
256 background: url(../../../../../images/colorpanel/transparent.png) repeat;
257 width: 40px;
258 height: 20px;
259}
260
253.propertiesPanel .button:active { 261.propertiesPanel .button:active {
254 outline: none; 262 outline: none;
255} 263}
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index fcd0ab01..5719a63d 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -136,6 +136,7 @@ exports.Properties = Montage.create(Component, {
136 ElementsMediator.setAttribute(this.application.ninja.currentDocument.model.documentRoot, "class", this.elementClass.value, "Change", "pi", this.application.ninja.currentDocument.model.documentRoot.elementModel.elementClass); 136 ElementsMediator.setAttribute(this.application.ninja.currentDocument.model.documentRoot, "class", this.elementClass.value, "Change", "pi", this.application.ninja.currentDocument.model.documentRoot.elementModel.elementClass);
137 } 137 }
138 } 138 }
139 NJevent("updatedID",this.application.ninja.selectedElements[0]);
139 } 140 }
140 }, 141 },
141 142