diff options
author | Jose Antonio Marquez | 2012-03-21 09:53:08 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-03-21 09:53:08 -0700 |
commit | beb72aa033f42d09d54a4ea6cc6b5ca59cc6fae7 (patch) | |
tree | 71ee74df0c3a56b680e4aa80f23905fcb1cc84f1 /node_modules/components-data/picasa-carousel.json | |
parent | 37cafa09653ff3e2cb88c5b51cdc1f6e066aa3e8 (diff) | |
parent | 31eee2972667d7553974f0857fdc458954219203 (diff) | |
download | ninja-beb72aa033f42d09d54a4ea6cc6b5ca59cc6fae7.tar.gz |
Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into FileIO-Montage-Components
Diffstat (limited to 'node_modules/components-data/picasa-carousel.json')
-rw-r--r-- | node_modules/components-data/picasa-carousel.json | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/node_modules/components-data/picasa-carousel.json b/node_modules/components-data/picasa-carousel.json index 34fe0e8f..2eb601c7 100644 --- a/node_modules/components-data/picasa-carousel.json +++ b/node_modules/components-data/picasa-carousel.json | |||
@@ -11,5 +11,10 @@ | |||
11 | "type": "string", | 11 | "type": "string", |
12 | "default": "" | 12 | "default": "" |
13 | } | 13 | } |
14 | ] | 14 | ], |
15 | "defaultStyles": { | ||
16 | "width":"800px", | ||
17 | "height":"160px", | ||
18 | "border": "1px" | ||
19 | } | ||
15 | } \ No newline at end of file | 20 | } \ No newline at end of file |