diff options
Diffstat (limited to 'js/panels/properties.reel')
-rwxr-xr-x | js/panels/properties.reel/properties.css | 10 | ||||
-rwxr-xr-x | js/panels/properties.reel/properties.js | 1 |
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 | ||