aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-20 16:56:12 -0700
committerValerio Virgillito2012-03-20 16:56:12 -0700
commitbabe504e1cdfd98a5df8fd325d54aab72ca3cdb0 (patch)
tree33869adab7f506f5d17b627ab722df47c6d050eb
parent94f1733599c36befb432dbe0a74e576f649327c8 (diff)
parenta44740514bb25dc777a901d91dc1bd72cab4175a (diff)
downloadninja-babe504e1cdfd98a5df8fd325d54aab72ca3cdb0.tar.gz
Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montage-integration
-rw-r--r--node_modules/components-data/feed-reader.json4
-rw-r--r--node_modules/montage/ui/feed-reader/feed-entry.reel/feed-entry.html5
-rw-r--r--node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html6
3 files changed, 8 insertions, 7 deletions
diff --git a/node_modules/components-data/feed-reader.json b/node_modules/components-data/feed-reader.json
index b2b240b2..1e055eef 100644
--- a/node_modules/components-data/feed-reader.json
+++ b/node_modules/components-data/feed-reader.json
@@ -18,7 +18,7 @@
18 } 18 }
19 ], 19 ],
20 "defaultStyles": { 20 "defaultStyles": {
21 "width":"350px", 21 "width":"380px",
22 "height":"250px" 22 "height":"120px"
23 } 23 }
24} \ No newline at end of file 24} \ No newline at end of file
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 @@
59 59
60 <style> 60 <style>
61 .feed-entry { 61 .feed-entry {
62 padding: 10px; 62 /*padding: 2px;*/
63 margin: 3px 0; 63 /*margin: 3px 0;*/
64 } 64 }
65 .feed-entry h2 { 65 .feed-entry h2 {
66 margin-top: 0px;
66 font-size: 24px; 67 font-size: 24px;
67 line-height: 24px; 68 line-height: 24px;
68 margin-bottom: 12px; 69 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 @@
52 52
53 <style> 53 <style>
54 div.feed-reader { 54 div.feed-reader {
55 padding: 10px; 55 /*padding: 2px;*/
56 height: 250px; 56 height: 120px;
57 width: 350px; 57 width: 380px;
58 } 58 }
59 59
60 .feed-entry { 60 .feed-entry {