From a6a6f9bcc5ff92f5bb5e9275336dfaec2d8e8f4c Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Fri, 16 Mar 2012 17:56:25 -0700
Subject: Presets Panel - Change Tab labels, Add Un-3d preset
---
js/panels/presets/content.reel/content.html | 6 +++---
js/panels/presets/default-transition-presets.js | 16 ++++++++++++++++
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/js/panels/presets/content.reel/content.html b/js/panels/presets/content.reel/content.html
index f01e6435..afbdd559 100644
--- a/js/panels/presets/content.reel/content.html
+++ b/js/panels/presets/content.reel/content.html
@@ -62,9 +62,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
diff --git a/js/panels/presets/default-transition-presets.js b/js/panels/presets/default-transition-presets.js
index 00873231..48f7c2b7 100644
--- a/js/panels/presets/default-transition-presets.js
+++ b/js/panels/presets/default-transition-presets.js
@@ -88,6 +88,22 @@ exports.transitionPresets = {
"-webkit-transform": "rotate(180deg)"
}
}]
+ },{
+ "text": "Remove 3D",
+ "selectorBase" : "remove-3d",
+ "rules" : [{
+ "selectorSuffix": "",
+ "styles" : {
+ "-webkit-transition": "all 0.4s ease-in"
+ }
+ },
+ {
+ "selectorSuffix" : ":hover",
+ "styles" : {
+ "-webkit-transform": "rotateX(0deg)",
+ "opacity": "1"
+ }
+ }]
}]
}]
};
\ No newline at end of file
--
cgit v1.2.3
From 41740c12e03ca1380eb80dc557faedae05e4ce1c Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Sat, 17 Mar 2012 00:06:03 -0700
Subject: Presets Panel - Fix conflict with default transition presets
---
js/panels/presets/default-transition-presets.js | 30 +++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/js/panels/presets/default-transition-presets.js b/js/panels/presets/default-transition-presets.js
index 48f7c2b7..15f4882f 100644
--- a/js/panels/presets/default-transition-presets.js
+++ b/js/panels/presets/default-transition-presets.js
@@ -89,6 +89,36 @@ exports.transitionPresets = {
}
}]
},{
+ "text": "Scale Up",
+ "selectorBase" : "scale-up",
+ "rules" : [{
+ "selectorSuffix" : "",
+ "styles" : {
+ "-webkit-transition": "-webkit-transform 0.4s ease-in"
+ }
+ }, {
+ "selectorSuffix" : ":hover",
+ "styles" : {
+ "-webkit-transform": "scale(1.4)"
+ }
+ }]
+ },
+ {
+ "text": "Scale Down",
+ "selectorBase" : "scale-down",
+ "rules" : [{
+ "selectorSuffix" : "",
+ "styles" : {
+ "-webkit-transition": "-webkit-transform 0.4s ease-in"
+ }
+ }, {
+ "selectorSuffix" : ":hover",
+ "styles" : {
+ "-webkit-transform": "scale(.5)"
+ }
+ }]
+ },
+ {
"text": "Remove 3D",
"selectorBase" : "remove-3d",
"rules" : [{
--
cgit v1.2.3
From 50ee8428d398d2a5f21f4d642642ba85d7df3e5e Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Mon, 19 Mar 2012 13:51:31 -0700
Subject: Replacing old button component with montage button component in our
UI.
Signed-off-by: Nivesh Rajbhandari
---
.../ui/property-control.reel/property-control.js | 2 +-
.../materials-library-panel.css | 8 ++---
.../materials-library-panel.html | 42 ++++++++++++++++++++--
.../materials-library-panel.js | 21 +----------
.../materials-popup.reel/materials-popup.html | 8 ++---
.../materials-popup.reel/materials-popup.js | 5 ++-
.../color/colorchippopup.reel/colorchippopup.js | 1 -
.../color/colorpanelpopup.reel/colorpanelpopup.js | 1 -
8 files changed, 51 insertions(+), 37 deletions(-)
diff --git a/js/components/ui/property-control.reel/property-control.js b/js/components/ui/property-control.reel/property-control.js
index 58b1be9f..cd59c02c 100755
--- a/js/components/ui/property-control.reel/property-control.js
+++ b/js/components/ui/property-control.reel/property-control.js
@@ -9,7 +9,7 @@ var Montage = require("montage/core/core").Montage,
HotText = require("js/components/hottext.reel").HotText,
HotTextUnit = require("js/components/hottextunit.reel").HotTextUnit,
Slider = require("js/components/slider.reel").Slider,
- Button = require("js/components/button.reel").Button,
+ Button = require("montage/ui/button.reel").Button,
Checkbox = require("js/components/checkbox.reel").Checkbox,
Combobox = require("js/components/combobox.reel").Combobox,
TextField = require("js/components/TextField.reel").TextField,
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
index 07488da1..fe88ebf6 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
@@ -23,7 +23,7 @@
width: 97%;
}
-#ml_buttons button {
+#ml_buttons .nj-skinned{
height: 22px;
overflow: hidden;
display: block;
@@ -31,17 +31,17 @@
margin: 0px 1px;
}
-#materialsLibraryPanel-ml_add_btn {
+#ml_add_btn {
float: left;
width: 60px;
}
-#materialsLibraryPanel-ml_copy_btn {
+#ml_copy_btn {
float: left;
width: 60px;
}
-#materialsLibraryPanel-ml_delete_btn {
+#ml_delete_btn {
float: right;
width: 60px;
}
\ No newline at end of file
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
index 6ba4ac75..fe17d0f8 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
@@ -10,6 +10,42 @@