From e25474df5116a7e336933a1d1d17ff11a0ef9786 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 28 Jun 2012 11:17:28 -0700 Subject: Fixing the button for the shape pi Signed-off-by: Valerio Virgillito --- js/panels/properties.reel/properties.css | 12 ++++++++---- js/panels/properties.reel/sections/custom.reel/custom.js | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'js/panels') diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css index d1aa750a..ce5145d0 100755 --- a/js/panels/properties.reel/properties.css +++ b/js/panels/properties.reel/properties.css @@ -314,11 +314,13 @@ input label { width:45px; } -.propertiesPanel div.montage-button:disabled { +/*.propertiesPanel div.montage-button:disabled {*/ +.propertiesPanel div[type=button]:disabled { opacity: 0.4; } -.propertiesPanel div.montage-button { +/*.propertiesPanel div.montage-button {*/ +.propertiesPanel div[type=button] { font-size: 9px; cursor: pointer; display: block; @@ -336,10 +338,12 @@ input label { height: 14px; } -.propertiesPanel div.montage-button:active { +/*.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.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 9c31cf45..84e89334 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, { -- cgit v1.2.3 From 12b8f40d5593d55e1fe64e4bef2ac3bc6709f6ff Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 28 Jun 2012 11:24:41 -0700 Subject: removing some comments Signed-off-by: Valerio Virgillito --- js/panels/properties.reel/properties.css | 4 ---- 1 file changed, 4 deletions(-) (limited to 'js/panels') diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css index ce5145d0..786eb57a 100755 --- a/js/panels/properties.reel/properties.css +++ b/js/panels/properties.reel/properties.css @@ -314,12 +314,10 @@ 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; @@ -338,12 +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 -- cgit v1.2.3