diff options
author | Eric Guzman | 2012-02-29 16:13:19 -0800 |
---|---|---|
committer | Eric Guzman | 2012-02-29 16:13:19 -0800 |
commit | 53bdb1e7773069c4cca59e88d6da91cd0f58c94a (patch) | |
tree | 44a2147fcbb43ea483f78a1e2e082919f9c81970 /js/panels/properties/sections/custom-rows/color-select.reel/color-select.html | |
parent | b2c60efb9c6f5dfa7b0fc5c2b9feebebc805ed97 (diff) | |
parent | b09956e4a9a35c5588cc7cd1f01efb617cbe0884 (diff) | |
download | ninja-53bdb1e7773069c4cca59e88d6da91cd0f58c94a.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
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 | ||