diff options
author | Valerio Virgillito | 2012-06-28 18:02:14 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-28 18:02:14 -0700 |
commit | 26dcad3dd3fe42519bd2617d803c2e8601e41637 (patch) | |
tree | 33057ea6479109dd3c8aa3edcb35ede1797a5617 | |
parent | 54f68d3635941489e34e53d9925c3659b3eeabbf (diff) | |
parent | 12b8f40d5593d55e1fe64e4bef2ac3bc6709f6ff (diff) | |
download | ninja-26dcad3dd3fe42519bd2617d803c2e8601e41637.tar.gz |
Merge pull request #354 from mencio/IKNINJA-1829
Fixing the button for the shape pi
-rwxr-xr-x | js/panels/properties.reel/properties.css | 8 | ||||
-rwxr-xr-x | js/panels/properties.reel/sections/custom.reel/custom.js | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css index d1aa750a..786eb57a 100755 --- a/js/panels/properties.reel/properties.css +++ b/js/panels/properties.reel/properties.css | |||
@@ -314,11 +314,11 @@ input label { | |||
314 | width:45px; | 314 | width:45px; |
315 | } | 315 | } |
316 | 316 | ||
317 | .propertiesPanel div.montage-button:disabled { | 317 | .propertiesPanel div[type=button]:disabled { |
318 | opacity: 0.4; | 318 | opacity: 0.4; |
319 | } | 319 | } |
320 | 320 | ||
321 | .propertiesPanel div.montage-button { | 321 | .propertiesPanel div[type=button] { |
322 | font-size: 9px; | 322 | font-size: 9px; |
323 | cursor: pointer; | 323 | cursor: pointer; |
324 | display: block; | 324 | display: block; |
@@ -336,10 +336,10 @@ input label { | |||
336 | height: 14px; | 336 | height: 14px; |
337 | } | 337 | } |
338 | 338 | ||
339 | .propertiesPanel div.montage-button:active { | 339 | .propertiesPanel div[type=button]:active { |
340 | background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #505050 100%); | 340 | background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #505050 100%); |
341 | } | 341 | } |
342 | 342 | ||
343 | .propertiesPanel div.montage-button:hover { | 343 | .propertiesPanel div[type=button]:hover { |
344 | -webkit-box-shadow: 0px 0px 3px #b4b4b4; | 344 | -webkit-box-shadow: 0px 0px 3px #b4b4b4; |
345 | } \ No newline at end of file | 345 | } \ No newline at end of file |
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js index 5112fca9..ed4616da 100755 --- a/js/panels/properties.reel/sections/custom.reel/custom.js +++ b/js/panels/properties.reel/sections/custom.reel/custom.js | |||
@@ -20,7 +20,7 @@ var Dropdown = require("js/components/combobox.reel").Combobox; | |||
20 | var TextField = require("js/components/textfield.reel").TextField; | 20 | var TextField = require("js/components/textfield.reel").TextField; |
21 | var LabelCheckbox = require("js/components/ui/label-checkbox.reel").LabelCheckbox; | 21 | var LabelCheckbox = require("js/components/ui/label-checkbox.reel").LabelCheckbox; |
22 | var ColorChip = require("js/components/ui/color-chip.reel").ColorChip; | 22 | var ColorChip = require("js/components/ui/color-chip.reel").ColorChip; |
23 | var Button = require("montage/ui/button.reel").Button; | 23 | var Button = require("montage/ui/native/button.reel").Button; |
24 | 24 | ||
25 | exports.CustomSection = Montage.create(Component, { | 25 | exports.CustomSection = Montage.create(Component, { |
26 | 26 | ||