Merge branch 'refs/heads/ninja-internal' into ColorGradientFix

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 {
     width:45px;
 }
 
-.propertiesPanel div.montage-button:disabled {
+.propertiesPanel div[type=button]:disabled {
     opacity: 0.4;
 }
 
-.propertiesPanel div.montage-button {
+.propertiesPanel div[type=button] {
     font-size: 9px;
     cursor: pointer;
     display: block;
@@ -336,10 +336,10 @@ input label {
     height: 14px;
 }
 
-.propertiesPanel div.montage-button:active {
+.propertiesPanel div[type=button]:active {
     background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #505050 100%);
 }
 
-.propertiesPanel div.montage-button:hover {
+.propertiesPanel div[type=button]:hover {
     -webkit-box-shadow: 0px 0px 3px #b4b4b4;
 }
\ 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;
 var TextField = require("js/components/textfield.reel").TextField;
 var LabelCheckbox = require("js/components/ui/label-checkbox.reel").LabelCheckbox;
 var ColorChip = require("js/components/ui/color-chip.reel").ColorChip;
-var Button = require("montage/ui/button.reel").Button;
+var Button = require("montage/ui/native/button.reel").Button;
 
 exports.CustomSection = Montage.create(Component, {