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/map.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/map.json')
-rw-r--r-- | node_modules/components-data/map.json | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/node_modules/components-data/map.json b/node_modules/components-data/map.json index 796b2fad..655d222d 100644 --- a/node_modules/components-data/map.json +++ b/node_modules/components-data/map.json | |||
@@ -8,8 +8,8 @@ | |||
8 | "properties": [ | 8 | "properties": [ |
9 | { | 9 | { |
10 | "name": "category", | 10 | "name": "category", |
11 | "type": "string", | 11 | "type": "select", |
12 | "default": "", | 12 | "default": "restaurant", |
13 | "possibleValues": ["restaurant", "hospital", "cafe", "museum"] | 13 | "possibleValues": ["restaurant", "hospital", "cafe", "museum"] |
14 | }, | 14 | }, |
15 | { | 15 | { |
@@ -18,5 +18,11 @@ | |||
18 | "default": "" | 18 | "default": "" |
19 | } | 19 | } |
20 | 20 | ||
21 | ] | 21 | ], |
22 | |||
23 | "defaultStyles": { | ||
24 | "width": "280px", | ||
25 | "height": "280px" | ||
26 | } | ||
27 | |||
22 | } \ No newline at end of file | 28 | } \ No newline at end of file |