Merge branch 'montage-integration' of github.com:ericguzman/ninja-internal into montage-integration

2 files changed, 49 insertions, 1 deletions

diff --git a/js/panels/presets/default-animation-presets.js b/js/panels/presets/default-animation-presets.js
index 2e656e86..0730c2ef 100644
--- a/js/panels/presets/default-animation-presets.js
+++ b/js/panels/presets/default-animation-presets.js
@@ -38,6 +38,54 @@ exports.animationPresets = {
             }]
     }, {
         "text": "3D Animations",
+    "children": [
+        {
+            "text": "Slide Out with Fade",
+            "selectorBase": "slide-fade-out",
+            "rules" : [{
+                "selectorSuffix" : "",
+                "styles" : {
+                    "-webkit-animation-name": "slide-fade-out",
+                    "-webkit-animation-duration": "5s",
+                    "-webkit-animation-iteration-count": "infinite",
+                    "-webkit-animation-direction": "normal",
+                    "-webkit-animation-timing-function": "ease",
+                    "-webkit-transform-style": "preserve-3d",
+                    "-webkit-transform": "perspective(1000)",
+                    "-webkit-animation-delay": "0s"
+                }
+            },{
+                "isKeyFrameRule": true,
+                "keys" : [{
+                    "keyText": "0%",
+                    "styles": {
+                        "opacity": "0",
+                        "-webkit-transform": "translate3d(0, 0, 0)"
+                    }
+                }, {
+                    "keyText": "10%",
+                    "styles": {
+                        "opacity": "1",
+                        "-webkit-transform": "translate3d(0, 0, 0)"
+                    }
+                }, {
+                    "keyText": "86%",
+                    "styles": {
+                        "opacity": "1",
+                        "-webkit-transform": "translate3d(0, 0, 0)"
+
+                    }
+                }, {
+                    "keyText": "100%",
+                    "styles": {
+                        "opacity": "0",
+                        "-webkit-transform": "translate3d(540px, 0, 0)"
+                    }
+                }]
+            }]
+        }]
+    }, {
+        "text": "3D Animations",
         "children": [
             {
                 "text": "Rotater",
diff --git a/node_modules/components-data/feed-reader.json b/node_modules/components-data/feed-reader.json
index 7a5bd276..39da73f3 100644
--- a/node_modules/components-data/feed-reader.json
+++ b/node_modules/components-data/feed-reader.json
@@ -14,7 +14,7 @@
         {
             "name": "feedDisplayMode",
             "type": "select",
-            "default": "animation",
+            "default": "timer",
             "possibleValues": ["animation", "timer"]
         }
     ],