diff options
| author | Jose Antonio Marquez | 2012-06-21 16:54:18 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-06-21 16:54:18 -0700 |
| commit | d6360c39f6cd90dd5e9a1d5ef5bd5211641dad42 (patch) | |
| tree | 564528119093e4e3408ccf180d55ac3d5e413813 /js/components/tools-properties/fill-properties.reel/fill-properties.html | |
| parent | bf6bed611714053aabc0d38978bddd62873d04aa (diff) | |
| parent | 2af33f19de48bb8fe269c51ceddd1bc1f591651f (diff) | |
| download | ninja-d6360c39f6cd90dd5e9a1d5ef5bd5211641dad42.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
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 | 2 |
1 files changed, 1 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 cf68520f..e5df9bd3 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.html +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html | |||
| @@ -66,7 +66,7 @@ | |||
| 66 | <div data-montage-id="fillProperties" class="subToolHolderPanel optionsFillTool toolOptionsFloatChildren"> | 66 | <div data-montage-id="fillProperties" class="subToolHolderPanel optionsFillTool toolOptionsFloatChildren"> |
| 67 | <input data-montage-id="useFillColor" type="checkbox" name="useFillColorControl" class="nj-skinned"/> | 67 | <input data-montage-id="useFillColor" type="checkbox" name="useFillColorControl" class="nj-skinned"/> |
| 68 | <div class="toolColorChipIcon FillTool"></div> | 68 | <div class="toolColorChipIcon FillTool"></div> |
| 69 | <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> | 69 | <div class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div> |
| 70 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </div> | 70 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </div> |
| 71 | 71 | ||
| 72 | <input data-montage-id="useWebGL" type="checkbox" name="useWebGLControl" class="nj-skinned"/> | 72 | <input data-montage-id="useWebGL" type="checkbox" name="useWebGLControl" class="nj-skinned"/> |