diff options
| author | Nivesh Rajbhandari | 2012-05-07 11:18:11 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-05-07 11:18:11 -0700 |
| commit | e377a8dc0b0e34905782ed867acb5fe725ae0131 (patch) | |
| tree | 6931311aabd7a4e366df195a168d437f1d0d8465 /js/components/tools-properties/brush-properties.reel | |
| parent | 8be6e94b57f4bd6e28754a6113b4d6a401365e13 (diff) | |
| parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
| download | ninja-e377a8dc0b0e34905782ed867acb5fe725ae0131.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
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> |