diff options
author | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
commit | c6ae80c488621d4ac189cb63309b6258115f823a (patch) | |
tree | dfa26112e1830972fcb212bbb5b17c9a901c645f /js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html | |
parent | 022e714cb5d10cd8575ab9907eddfb184a990b66 (diff) | |
parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
download | ninja-c6ae80c488621d4ac189cb63309b6258115f823a.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate
Diffstat (limited to 'js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html')
-rwxr-xr-x | js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html index 5620eed8..579930f0 100755 --- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html +++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html | |||
@@ -12,7 +12,7 @@ | |||
12 | <script type="text/montage-serialization"> | 12 | <script type="text/montage-serialization"> |
13 | { | 13 | { |
14 | "useStrokeColor": { | 14 | "useStrokeColor": { |
15 | "prototype": "montage/ui/checkbox.reel", | 15 | "prototype": "montage/ui/input-checkbox.reel", |
16 | "properties": { | 16 | "properties": { |
17 | "element": {"#": "useStrokeColor"}, | 17 | "element": {"#": "useStrokeColor"}, |
18 | "identifier": "useStrokeColor", | 18 | "identifier": "useStrokeColor", |
@@ -21,7 +21,7 @@ | |||
21 | }, | 21 | }, |
22 | 22 | ||
23 | "useBorderWidth": { | 23 | "useBorderWidth": { |
24 | "prototype": "montage/ui/checkbox.reel", | 24 | "prototype": "montage/ui/input-checkbox.reel", |
25 | "properties": { | 25 | "properties": { |
26 | "element": {"#": "useBorderWidth"}, | 26 | "element": {"#": "useBorderWidth"}, |
27 | "identifier": "useBorderWidth", | 27 | "identifier": "useBorderWidth", |
@@ -49,7 +49,7 @@ | |||
49 | }, | 49 | }, |
50 | 50 | ||
51 | "useBorderStyle": { | 51 | "useBorderStyle": { |
52 | "prototype": "montage/ui/checkbox.reel", | 52 | "prototype": "montage/ui/input-checkbox.reel", |
53 | "properties": { | 53 | "properties": { |
54 | "element": {"#": "useBorderStyle"}, | 54 | "element": {"#": "useBorderStyle"}, |
55 | "identifier": "useBorderStyle", | 55 | "identifier": "useBorderStyle", |
@@ -65,7 +65,7 @@ | |||
65 | }, | 65 | }, |
66 | 66 | ||
67 | "useStrokeSize": { | 67 | "useStrokeSize": { |
68 | "prototype": "montage/ui/checkbox.reel", | 68 | "prototype": "montage/ui/input-checkbox.reel", |
69 | "properties": { | 69 | "properties": { |
70 | "element": {"#": "useStrokeSize"}, | 70 | "element": {"#": "useStrokeSize"}, |
71 | "identifier": "useStrokeSize", | 71 | "identifier": "useStrokeSize", |
@@ -94,7 +94,7 @@ | |||
94 | }, | 94 | }, |
95 | 95 | ||
96 | "useWebGL": { | 96 | "useWebGL": { |
97 | "prototype": "montage/ui/checkbox.reel", | 97 | "prototype": "montage/ui/input-checkbox.reel", |
98 | "properties": { | 98 | "properties": { |
99 | "element": {"#": "useWebGL"}, | 99 | "element": {"#": "useWebGL"}, |
100 | "identifier": "useWebGL", | 100 | "identifier": "useWebGL", |