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

2 files changed, 6 insertions, 5 deletions

diff --git a/node_modules/montage/ui/feed-reader/feed-entry.reel/feed-entry.html b/node_modules/montage/ui/feed-reader/feed-entry.reel/feed-entry.html
index 6c3a5298..b78d2516 100644
--- a/node_modules/montage/ui/feed-reader/feed-entry.reel/feed-entry.html
+++ b/node_modules/montage/ui/feed-reader/feed-entry.reel/feed-entry.html
@@ -59,10 +59,11 @@
 
     <style>
        .feed-entry {
-           padding: 10px;
-           margin: 3px 0;
+           /*padding: 2px;*/
+           /*margin: 3px 0;*/
        }
        .feed-entry h2 {
+           margin-top: 0px;
            font-size: 24px;
            line-height: 24px;
            margin-bottom: 12px;           
diff --git a/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html b/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html
index 21f3d4ee..56523984 100644
--- a/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html
+++ b/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html
@@ -52,9 +52,9 @@
 
     <style>
        div.feed-reader  {
-           padding: 10px; 
-           height: 250px;
-           width: 350px;        
+           /*padding: 2px;*/
+           height: 120px;
+           width: 380px;
        }
        
        .feed-entry {