aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/brush-properties.reel/brush-properties.html
diff options
context:
space:
mode:
authorJonathan Duran2012-05-11 14:13:07 -0700
committerJonathan Duran2012-05-11 14:13:07 -0700
commit1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2 (patch)
tree2563aa7694c3caaf813ca71ef3250b2a76ee0041 /js/components/tools-properties/brush-properties.reel/brush-properties.html
parent32257ac142f872d3c1f6c07504bae77ae884ed93 (diff)
parent6fcaa4e923a19672b5860b4c6f67d836680e7e99 (diff)
downloadninja-1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2.tar.gz
Merge branch 'refs/heads/TimelineUber' into TimelineProps
Diffstat (limited to 'js/components/tools-properties/brush-properties.reel/brush-properties.html')
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.html10
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>