diff options
| author | Jon Reid | 2012-03-01 09:23:46 -0800 |
|---|---|---|
| committer | Jon Reid | 2012-03-01 09:23:46 -0800 |
| commit | e67000c704e284f4ab9b50c845853988272ce800 (patch) | |
| tree | fad04a6a5ef5bfc8fa4efe88dac3eb7329bc3596 /js/panels/properties/sections/custom-rows/color-select.reel/color-select.html | |
| parent | 939cb7eccb8a5ec655fbde8b470894d293832307 (diff) | |
| parent | 82ed48cc48ae1f8163021a0998e00d87da396d65 (diff) | |
| download | ninja-e67000c704e284f4ab9b50c845853988272ce800.tar.gz | |
Merge branch 'Timeline-main' into Timeline-newdoc
Diffstat (limited to 'js/panels/properties/sections/custom-rows/color-select.reel/color-select.html')
| -rwxr-xr-x | js/panels/properties/sections/custom-rows/color-select.reel/color-select.html | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/js/panels/properties/sections/custom-rows/color-select.reel/color-select.html b/js/panels/properties/sections/custom-rows/color-select.reel/color-select.html index 9c2588b9..96cc4de7 100755 --- a/js/panels/properties/sections/custom-rows/color-select.reel/color-select.html +++ b/js/panels/properties/sections/custom-rows/color-select.reel/color-select.html | |||
| @@ -14,7 +14,9 @@ | |||
| 14 | "properties" : { | 14 | "properties" : { |
| 15 | "element" : {"#": "section"}, | 15 | "element" : {"#": "section"}, |
| 16 | "Stroke" : {"#": "Stroke"}, | 16 | "Stroke" : {"#": "Stroke"}, |
| 17 | "Fill" : {"#": "Fill"} | 17 | "Fill" : {"#": "Fill"}, |
| 18 | "strokeChip" : {"@": "colorChip"}, | ||
| 19 | "fillChip" : {"@": "colorChip2"} | ||
| 18 | } | 20 | } |
| 19 | }, | 21 | }, |
| 20 | 22 | ||