diff options
| author | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
| commit | 48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch) | |
| tree | 899f9cf1b09a01bc073f92ab498236aed80b38ec /js/components/tools-properties/brush-properties.reel | |
| parent | 2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff) | |
| parent | d220c02e246b30509b28a47fa04916ca2b8122e4 (diff) | |
| download | ninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/components/tools-properties/brush-properties.reel')
| -rwxr-xr-x | js/components/tools-properties/brush-properties.reel/brush-properties.html | 10 |
1 files changed, 5 insertions, 5 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 b0c02734..e7aaf0e8 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.html +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html | |||
| @@ -80,16 +80,16 @@ | |||
| 80 | 80 | ||
| 81 | <body> | 81 | <body> |
| 82 | <div data-montage-id="brushProperties" class="subToolHolderPanel"> | 82 | <div data-montage-id="brushProperties" class="subToolHolderPanel"> |
| 83 | <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> | 83 | <div data-montage-id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> |
| 84 | <label class="label"> Width:</label> | 84 | <label class="label"> Width:</label> |
| 85 | <div id="strokeSize" class="label"></div> | 85 | <div data-montage-id="strokeSize" class="label"></div> |
| 86 | <label class="label"> Hardness:</label> | 86 | <label class="label"> Hardness:</label> |
| 87 | <div id="strokeHardness" class="label"></div> | 87 | <div data-montage-id="strokeHardness" class="label"></div> |
| 88 | <label class="label"><input id="doSmoothing" type="checkbox" name="doSmoothingControl" class="checkBoxAlign"/>Smoothing</label> | 88 | <label class="label"><input id="doSmoothing" type="checkbox" name="doSmoothingControl" class="checkBoxAlign"/>Smoothing</label> |
| 89 | <div id="smoothingAmount" class="label"></div> | 89 | <div data-montage-id="smoothingAmount" class="label"></div> |
| 90 | <label class="label"><input id="useCalligraphic" type="checkbox" name="useCalligraphicControl" class="checkBoxAlign"/>Calligraphic</label> | 90 | <label class="label"><input id="useCalligraphic" type="checkbox" name="useCalligraphicControl" class="checkBoxAlign"/>Calligraphic</label> |
| 91 | <label class="label" id="angleLabel"> Angle:</label> | 91 | <label class="label" id="angleLabel"> Angle:</label> |
| 92 | <div id="strokeAngle" class="label"></div> | 92 | <div data-montage-id="strokeAngle" class="label"></div> |
| 93 | 93 | ||
| 94 | </div> | 94 | </div> |
| 95 | </div> | 95 | </div> |