diff options
| author | Kruti Shah | 2012-06-22 10:00:53 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-06-22 10:00:53 -0700 |
| commit | 4bf8e4cdc179c3b388fc06f26008808aa4b77eb0 (patch) | |
| tree | 743ea0d3a3af9cae65d5af531a6dba1951b03b33 /js/components/tools-properties/fill-properties.reel/fill-properties.html | |
| parent | cb9fbfeba90b5b76d3f3f2b9303129ca4651e5be (diff) | |
| parent | 020ad879a627c4234a8732f05e175ad69cedf180 (diff) | |
| download | ninja-4bf8e4cdc179c3b388fc06f26008808aa4b77eb0.tar.gz | |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
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"/> |