diff options
author | Kruti Shah | 2012-06-12 13:09:11 -0700 |
---|---|---|
committer | Kruti Shah | 2012-06-12 13:09:11 -0700 |
commit | d648c842905c7c53e0f89b943982493d2b79f56e (patch) | |
tree | eb5585f92061975215f6d19305a8d1b76262e2fc /node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html | |
parent | bedb38e14887b29eae3cdf1c8d435259c920257c (diff) | |
parent | cf3b96822665751dae7a64644db3cb3960733c3d (diff) | |
download | ninja-d648c842905c7c53e0f89b943982493d2b79f56e.tar.gz |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/controllers/elements/element-controller.js
js/document/_toDelete/html-document.js
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html')
-rw-r--r-- | node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html index 6b2e51e2..b8b9f39a 100644 --- a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html +++ b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html | |||
@@ -6,8 +6,7 @@ | |||
6 | <script type="text/montage-serialization"> | 6 | <script type="text/montage-serialization"> |
7 | { | 7 | { |
8 | "title": { | 8 | "title": { |
9 | "module": "montage/ui/dynamic-text.reel", | 9 | "prototype": "montage/ui/dynamic-text.reel", |
10 | "name": "DynamicText", | ||
11 | "properties": { | 10 | "properties": { |
12 | "element": {"#": "entry-title"} | 11 | "element": {"#": "entry-title"} |
13 | }, | 12 | }, |
@@ -20,8 +19,7 @@ | |||
20 | } | 19 | } |
21 | }, | 20 | }, |
22 | "entryLink": { | 21 | "entryLink": { |
23 | "module": "montage/ui/anchor.reel", | 22 | "prototype": "montage/ui/anchor.reel", |
24 | "name": "Anchor", | ||
25 | "properties": { | 23 | "properties": { |
26 | "element": {"#": "entry-url"} | 24 | "element": {"#": "entry-url"} |
27 | }, | 25 | }, |
@@ -34,8 +32,7 @@ | |||
34 | } | 32 | } |
35 | }, | 33 | }, |
36 | "description": { | 34 | "description": { |
37 | "module": "montage/ui/dynamic-text.reel", | 35 | "prototype": "montage/ui/dynamic-text.reel", |
38 | "name": "DynamicText", | ||
39 | "properties": { | 36 | "properties": { |
40 | "element": {"#": "entry-description"} | 37 | "element": {"#": "entry-description"} |
41 | }, | 38 | }, |
@@ -48,8 +45,7 @@ | |||
48 | } | 45 | } |
49 | }, | 46 | }, |
50 | "owner": { | 47 | "owner": { |
51 | "module": "montage-google/feed-reader/feed-entry.reel", | 48 | "prototype": "montage-google/feed-reader/feed-entry.reel", |
52 | "name": "FeedEntry", | ||
53 | "properties": { | 49 | "properties": { |
54 | "element": {"#": "feed-entry"} | 50 | "element": {"#": "feed-entry"} |
55 | } | 51 | } |
@@ -66,7 +62,7 @@ | |||
66 | margin-top: 0px; | 62 | margin-top: 0px; |
67 | font-size: 24px; | 63 | font-size: 24px; |
68 | line-height: 24px; | 64 | line-height: 24px; |
69 | margin-bottom: 12px; | 65 | margin-bottom: 12px; |
70 | } | 66 | } |
71 | .feed-entry .entry-title { | 67 | .feed-entry .entry-title { |
72 | font-weight: bold; | 68 | font-weight: bold; |
@@ -79,10 +75,9 @@ | |||
79 | 75 | ||
80 | </head> | 76 | </head> |
81 | <body> | 77 | <body> |
82 | <div class="feed-entry" id="feed-entry"> | 78 | <div class="feed-entry" data-montage-id="feed-entry"> |
83 | 79 | <a target="_blank" data-montage-id="entry-url" class="entry-url"><h2 data-montage-id="entry-title" class="entry-title"></h2></a> | |
84 | <a target="_blank" id="entry-url" class="entry-url"><h2 id="entry-title" class="entry-title"></h2></a> | 80 | <p data-montage-id="entry-description" class="entry-description"></p> |
85 | <p id="entry-description" class="entry-description"></p> | ||
86 | </div> | 81 | </div> |
87 | 82 | ||
88 | </body> | 83 | </body> |