equal
deleted
inserted
replaced
15 #RenkanContainer { |
15 #RenkanContainer { |
16 float: left; |
16 float: left; |
17 width: 600px; |
17 width: 600px; |
18 height: 500px; |
18 height: 500px; |
19 margin: 5px; |
19 margin: 5px; |
20 background: #fff; |
|
21 } |
20 } |
22 </style> |
21 </style> |
23 </head> |
22 </head> |
24 |
23 |
25 <body> |
24 <body> |
58 { type: "Annotation" }, |
57 { type: "Annotation" }, |
59 { type: "Tweet" }, |
58 { type: "Tweet" }, |
60 { |
59 { |
61 type: "Renkan", |
60 type: "Renkan", |
62 container: "RenkanContainer", |
61 container: "RenkanContainer", |
63 data: "json/renkan.json" |
62 data: [ "json/renkan.json", "json/renkan-2.json" ] |
64 }, |
63 }, |
65 { type: "Mediafragment"} |
64 { type: "Mediafragment"} |
66 ] |
65 ] |
67 }, |
66 }, |
68 player:{ |
67 player:{ |