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/brush-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/brush-properties.reel')
| -rwxr-xr-x | js/components/tools-properties/brush-properties.reel/brush-properties.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html index 7d99a42a..8753e921 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.html +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html | |||
| @@ -82,7 +82,7 @@ | |||
| 82 | <body> | 82 | <body> |
| 83 | <div data-montage-id="brushProperties" class="subToolHolderPanel toolOptionsFloatChildren"> | 83 | <div data-montage-id="brushProperties" class="subToolHolderPanel toolOptionsFloatChildren"> |
| 84 | <div class="toolColorChipIcon FillTool"></div> | 84 | <div class="toolColorChipIcon FillTool"></div> |
| 85 | <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> | 85 | <div class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div> |
| 86 | <div class="nj-divider divider-vertical"> </div> | 86 | <div class="nj-divider divider-vertical"> </div> |
| 87 | <label class="label"> Width:</label> | 87 | <label class="label"> Width:</label> |
| 88 | <div data-montage-id="strokeSize" class="label"></div> | 88 | <div data-montage-id="strokeSize" class="label"></div> |