diff options
| author | hwc487 | 2012-06-05 14:05:34 -0700 |
|---|---|---|
| committer | hwc487 | 2012-06-05 14:05:34 -0700 |
| commit | 920436977433ea55c01ce1e73895d1db0a6abac1 (patch) | |
| tree | 8dcf9fb4bd1c23d121e9e2166325f8fdd1dc9884 /node_modules/components-data | |
| parent | 641d59527d842b5adc626a38677365cb9d943840 (diff) | |
| parent | fae2c19f64a00098fe42da5e9c6cb7cdcc8c8721 (diff) | |
| download | ninja-920436977433ea55c01ce1e73895d1db0a6abac1.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'node_modules/components-data')
| -rw-r--r-- | node_modules/components-data/feed-reader.json | 1 | ||||
| -rw-r--r-- | node_modules/components-data/picasa-carousel.json | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/node_modules/components-data/feed-reader.json b/node_modules/components-data/feed-reader.json index 5e8ca527..0676cac1 100644 --- a/node_modules/components-data/feed-reader.json +++ b/node_modules/components-data/feed-reader.json | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | "possibleValues": ["animation", "timer"] | 18 | "possibleValues": ["animation", "timer"] |
| 19 | } | 19 | } |
| 20 | ], | 20 | ], |
| 21 | |||
| 21 | "defaultStyles": { | 22 | "defaultStyles": { |
| 22 | "width":"380px", | 23 | "width":"380px", |
| 23 | "height":"120px" | 24 | "height":"120px" |
diff --git a/node_modules/components-data/picasa-carousel.json b/node_modules/components-data/picasa-carousel.json index b0711b12..4ab329e5 100644 --- a/node_modules/components-data/picasa-carousel.json +++ b/node_modules/components-data/picasa-carousel.json | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | "default": "" | 12 | "default": "" |
| 13 | } | 13 | } |
| 14 | ], | 14 | ], |
| 15 | |||
| 15 | "defaultStyles": { | 16 | "defaultStyles": { |
| 16 | "width":"800px", | 17 | "width":"800px", |
| 17 | "height":"160px", | 18 | "height":"160px", |