aboutsummaryrefslogtreecommitdiff
path: root/node_modules/components-data/picasa-carousel.json
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-27 09:10:58 -0700
committerPushkar Joshi2012-03-27 09:10:58 -0700
commit0c26aff9c19c2b39fca06fa6b3bc76b672204065 (patch)
treee778f2b9d5d525aa364360d5996536a0a06379bd /node_modules/components-data/picasa-carousel.json
parent753244b4713243ab19ca246be674f0b45fb85b72 (diff)
parent309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff)
downloadninja-0c26aff9c19c2b39fca06fa6b3bc76b672204065.tar.gz
Merge branch 'master' into brushtool
Conflicts: js/controllers/elements/shapes-controller.js
Diffstat (limited to 'node_modules/components-data/picasa-carousel.json')
-rw-r--r--node_modules/components-data/picasa-carousel.json20
1 files changed, 20 insertions, 0 deletions
diff --git a/node_modules/components-data/picasa-carousel.json b/node_modules/components-data/picasa-carousel.json
new file mode 100644
index 00000000..2eb601c7
--- /dev/null
+++ b/node_modules/components-data/picasa-carousel.json
@@ -0,0 +1,20 @@
1{
2 "component": "picasa-carousel",
3
4 "module": "montage/ui/picasa-carousel.reel",
5
6 "name": "PicasaCarousel",
7
8 "properties": [
9 {
10 "name": "queryParameter",
11 "type": "string",
12 "default": ""
13 }
14 ],
15 "defaultStyles": {
16 "width":"800px",
17 "height":"160px",
18 "border": "1px"
19 }
20} \ No newline at end of file