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/pen-properties.reel | |
| 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/pen-properties.reel')
| -rwxr-xr-x | js/components/tools-properties/pen-properties.reel/pen-properties.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html index adb5cd7d..c77ac660 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.html +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html | |||
| @@ -51,9 +51,9 @@ | |||
| 51 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </div> | 51 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </div> |
| 52 | 52 | ||
| 53 | <div class="toolColorChipIcon PencilTool"></div> | 53 | <div class="toolColorChipIcon PencilTool"></div> |
| 54 | <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div> | 54 | <div class="toolColorChipContainer"><div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div></div> |
| 55 | <div class="toolColorChipIcon FillTool"></div> | 55 | <div class="toolColorChipIcon FillTool"></div> |
| 56 | <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> | 56 | <div class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div> |
| 57 | <div class="nj-divider divider-vertical"> </div> | 57 | <div class="nj-divider divider-vertical"> </div> |
| 58 | <label class="label"> Stroke:</label> | 58 | <label class="label"> Stroke:</label> |
| 59 | <div data-montage-id="strokeSize" class="label"></div> | 59 | <div data-montage-id="strokeSize" class="label"></div> |