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

1 files changed, 43 insertions, 5 deletions

diff --git a/js/panels/presets/default-transition-presets.js b/js/panels/presets/default-transition-presets.js
index 00873231..f8968085 100644
--- a/js/panels/presets/default-transition-presets.js
+++ b/js/panels/presets/default-transition-presets.js
@@ -13,7 +13,6 @@ exports.transitionPresets = {
                 "text": "Fade In",
                 "selectorBase" : "fade-in",
                 "rules" : [{
-                    "selectorSuffix": "",
                     "styles" : {
                         "opacity": "0.25",
                         "-webkit-transition": "all 0.4s ease-in"
@@ -29,7 +28,6 @@ exports.transitionPresets = {
                 "text": "Fade Out",
                 "selectorBase" : "fade-out",
                 "rules" : [{
-                    "selectorSuffix": "",
                     "styles" : {
                         "opacity": "1",
                         "-webkit-transition": "all 0.4s ease-in"
@@ -48,7 +46,6 @@ exports.transitionPresets = {
                 "text": "Slide Right",
                 "selectorBase" : "slide-right",
                 "rules" : [{
-                    "selectorSuffix": "",
                     "styles" : {
                         "-webkit-transition": "all 0.4s ease-in"
                     }
@@ -63,7 +60,6 @@ exports.transitionPresets = {
                 "text": "Slide Left",
                 "selectorBase" : "slide-left",
                 "rules" : [{
-                    "selectorSuffix": "",
                     "styles" : {
                         "-webkit-transition": "all 0.4s ease-in"
                     }
@@ -78,7 +74,6 @@ exports.transitionPresets = {
                 "text": "Rotate",
                 "selectorBase" : "rotate",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "-webkit-transition": "all 0.4s ease-in"
                     }
@@ -88,6 +83,49 @@ exports.transitionPresets = {
                         "-webkit-transform": "rotate(180deg)"
                     }
                 }]
+            },{
+                "text": "Scale Up",
+                "selectorBase" : "scale-up",
+                "rules" : [{
+                    "styles" : {
+                        "-webkit-transition": "-webkit-transform 0.4s ease-in"
+                    }
+                }, {
+                    "selectorSuffix" : ":hover",
+                    "styles" : {
+                        "-webkit-transform": "scale(1.4)"
+                    }
+                }]
+            },
+            {
+                "text": "Scale Down",
+                "selectorBase" : "scale-down",
+                "rules" : [{
+                    "styles" : {
+                        "-webkit-transition": "-webkit-transform 0.4s ease-in"
+                    }
+                }, {
+                    "selectorSuffix" : ":hover",
+                    "styles" : {
+                        "-webkit-transform": "scale(.5)"
+                    }
+                }]
+            },
+            {
+                "text": "Remove 3D",
+                "selectorBase" : "remove-3d",
+                "rules" : [{
+                    "styles" : {
+                        "-webkit-transition": "all 0.4s ease-in"
+                    }
+                },
+                    {
+                    "selectorSuffix" : ":hover",
+                    "styles" : {
+                        "-webkit-transform": "rotateX(0deg)",
+                        "opacity": "1"
+                    }
+                }]
             }]
     }]
 };
\ No newline at end of file