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

3 files changed, 67 insertions, 18 deletions

diff --git a/js/panels/presets/default-animation-presets.js b/js/panels/presets/default-animation-presets.js
index 10a3e906..2e656e86 100644
--- a/js/panels/presets/default-animation-presets.js
+++ b/js/panels/presets/default-animation-presets.js
@@ -18,23 +18,23 @@ exports.animationPresets = {
                         "-webkit-animation": "border-morph 2s infinite"
                     }
                 },
-                {
-                    "isKeyFrameRule": true,
-                    "keys" : [{
-                        "keyText": "0%",
-                        "styles": { "border-radius": "0" }
-                    }, {
-                        "keyText": "50%",
-                        "styles": {
-                            "border-radius": "100%"
-                        }
-                    }, {
-                        "keyText": "100%",
-                        "styles": {
-                            "border-radius": "0%"
-                        }
+                    {
+                        "isKeyFrameRule": true,
+                        "keys" : [{
+                            "keyText": "0%",
+                            "styles": { "border-radius": "0" }
+                        }, {
+                            "keyText": "50%",
+                            "styles": {
+                                "border-radius": "100%"
+                            }
+                        }, {
+                            "keyText": "100%",
+                            "styles": {
+                                "border-radius": "0%"
+                            }
+                        }]
                     }]
-                }]
             }]
     }, {
         "text": "3D Animations",
@@ -50,7 +50,7 @@ exports.animationPresets = {
                         "-webkit-animation-iteration-count": "infinite",
                         "-webkit-animation-direction": "normal",
                         "-webkit-animation-timing-function": "ease-out",
-                        "-webkit-transform-origin": "200% 50%",
+                        "-webkit-transform-origin": "100% 50%",
                         "-webkit-transform-style": "preserve-3d",
                         "-webkit-transform": "perspective(1000)",
                         "-webkit-animation-delay": "0s"
@@ -89,6 +89,51 @@ exports.animationPresets = {
                         }
                     }]
                 }]
+            },
+            {
+                "text": "Rotate with Fade In",
+                "selectorBase" : "rotate-with-fade-in",
+                "rules" : [{
+                    "selectorSuffix" : "",
+                    "styles" : {
+                        "-webkit-animation-name": "rotate-with-fade-in",
+                        "-webkit-animation-duration": "5s",
+                        "-webkit-animation-iteration-count": "infinite",
+                        "-webkit-animation-direction": "normal",
+                        "-webkit-animation-timing-function": "ease-out",
+                        "-webkit-transform-origin": "100% 50%",
+                        "-webkit-transform-style": "preserve-3d",
+                        "-webkit-transform": "perspective(1000)",
+                        "-webkit-animation-delay": "0s"
+                    }
+                },{
+                    "isKeyFrameRule": true,
+                    "keys" : [{
+                        "keyText": "0%",
+                        "styles": {
+                            "opacity": "0",
+                            "-webkit-transform": "perspective(1000) rotateY(-90deg)"
+                        }
+                    }, {
+                        "keyText": "15%",
+                        "styles": {
+                            "opacity": "1",
+                            "-webkit-transform": "perspective(1000) rotateY(0deg)"
+                        }
+                    }, {
+                        "keyText": "85%",
+                        "styles": {
+                            "opacity": "1",
+                            "-webkit-transform": "perspective(1000) rotateY(0deg)"
+                        }
+                    }, {
+                        "keyText": "100%",
+                        "styles": {
+                            "opacity": "0",
+                            "-webkit-transform": "perspective(1000) rotateY(95deg)"
+                        }
+                    }]
+                }]
             }]
     }]
 };
\ No newline at end of file
diff --git a/node_modules/components-data/feed-reader.json b/node_modules/components-data/feed-reader.json
index aa9bf340..b2b240b2 100644
--- a/node_modules/components-data/feed-reader.json
+++ b/node_modules/components-data/feed-reader.json
@@ -10,6 +10,11 @@
             "name": "feedURL",
             "type": "string",
             "default": null
+        },
+        {
+            "name": "feedDisplayMode",
+            "type": "string",
+            "default": "timer"
         }
     ],
     "defaultStyles":  {
diff --git a/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html
index a405fc7c..96d823a5 100644
--- a/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html
+++ b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html
@@ -70,7 +70,6 @@
             width: 640px;
             border: 5px solid #000;
             border-radius: 5px;
-            background: #000;
 
             position: fixed;
             top: 50%;