diff options
| author | Jose Antonio Marquez | 2012-02-29 15:15:51 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-29 15:15:51 -0800 |
| commit | b0b4a1ee6792d98f06cbd8ecf5291e66db8a4eef (patch) | |
| tree | 5978eb8742df65de0e0b98454bfc04c2b4cac6e7 /js/panels/properties/sections/custom-rows/color-select.reel/color-select.html | |
| parent | 3a25881b3a463e4f695be2f663f141710ba1d1c1 (diff) | |
| parent | b09956e4a9a35c5588cc7cd1f01efb617cbe0884 (diff) | |
| download | ninja-b0b4a1ee6792d98f06cbd8ecf5291e66db8a4eef.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into Color
Conflicts:
js/controllers/elements/shapes-controller.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 | ||