diff options
| author | Eric Guzman | 2012-03-20 15:03:45 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-03-20 15:03:45 -0700 |
| commit | 22dd8732cfd52f6d9db3fca674a375bf3ff13702 (patch) | |
| tree | f0878c45b3325d86f6d9da9f581ebad5e1603354 /node_modules | |
| parent | 36ce3c432a40f01338b0f4731b100d7a7e71a823 (diff) | |
| parent | 803286628560fd79a57028c65c42c7f19a89c746 (diff) | |
| download | ninja-22dd8732cfd52f6d9db3fca674a375bf3ff13702.tar.gz | |
Merge branch 'master' of github.com:francoisfrisch/ninja-internal into FeedReaderAnimation
Diffstat (limited to 'node_modules')
| -rw-r--r-- | node_modules/components-data/feed-reader.json | 6 |
1 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 923222db..b2b240b2 100644 --- a/node_modules/components-data/feed-reader.json +++ b/node_modules/components-data/feed-reader.json | |||
| @@ -16,5 +16,9 @@ | |||
| 16 | "type": "string", | 16 | "type": "string", |
| 17 | "default": "timer" | 17 | "default": "timer" |
| 18 | } | 18 | } |
| 19 | ] | 19 | ], |
| 20 | "defaultStyles": { | ||
| 21 | "width":"350px", | ||
| 22 | "height":"250px" | ||
| 23 | } | ||
| 20 | } \ No newline at end of file | 24 | } \ No newline at end of file |