diff options
| author | John Mayhew | 2012-05-10 15:10:58 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-05-10 15:10:58 -0700 |
| commit | ba64dfa1d64969e290f15459a826171468fe3550 (patch) | |
| tree | 10b26bbfde954d4069b58e866d1105047a2ec72e /js/components/tools-properties/fill-properties.reel/fill-properties.html | |
| parent | d32cf39a8ef1e2d2fb50f1183c5546fdac83b396 (diff) | |
| download | ninja-ba64dfa1d64969e290f15459a826171468fe3550.tar.gz | |
put color chips in the inkbottle and fill tool
Diffstat (limited to 'js/components/tools-properties/fill-properties.reel/fill-properties.html')
| -rwxr-xr-x | js/components/tools-properties/fill-properties.reel/fill-properties.html | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html index 975b4e6f..734966dc 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.html +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html | |||
| @@ -23,18 +23,25 @@ | |||
| 23 | "prototype": "js/components/tools-properties/fill-properties.reel", | 23 | "prototype": "js/components/tools-properties/fill-properties.reel", |
| 24 | "properties": { | 24 | "properties": { |
| 25 | "element": {"#": "fillProperties"}, | 25 | "element": {"#": "fillProperties"}, |
| 26 | |||
| 27 | "_fillColorCtrl": {"#": "fillColorCtrl"}, | ||
| 28 | |||
| 26 | "_useWebGL": {"#": "useWebGLCH"}, | 29 | "_useWebGL": {"#": "useWebGLCH"}, |
| 27 | "_materialsContainer": {"#": "materialsContainer"}, | 30 | "_materialsContainer": {"#": "materialsContainer"}, |
| 28 | "_fillMaterial": {"@": "_fillMaterialCB"} | 31 | "_fillMaterial": {"@": "_fillMaterialCB"} |
| 29 | } | 32 | } |
| 30 | } | 33 | } |
| 31 | } | 34 | } |
| 32 | </script> | 35 | </script> |
| 33 | 36 | ||
| 34 | </head> | 37 | </head> |
| 35 | 38 | ||
| 36 | <body> | 39 | <body> |
| 37 | <div data-montage-id="fillProperties" class="subToolHolderPanel optionsFillTool toolOptionsFloatChildren"> | 40 | <div data-montage-id="fillProperties" class="subToolHolderPanel optionsFillTool toolOptionsFloatChildren"> |
| 41 | <div class="toolColorChipIcon FillTool"></div> | ||
| 42 | <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> | ||
| 43 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </div> | ||
| 44 | |||
| 38 | <input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/> | 45 | <input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/> |
| 39 | <label class="label">Use WebGL</label> | 46 | <label class="label">Use WebGL</label> |
| 40 | <div data-montage-id="materialsContainer" class="materialsContainerOptions toolOptionsFloatChildren"> | 47 | <div data-montage-id="materialsContainer" class="materialsContainerOptions toolOptionsFloatChildren"> |