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

2 files changed, 5 insertions, 1 deletions

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%;