aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/brush-properties.reel/brush-properties.html
diff options
context:
space:
mode:
authorhwc4872012-05-11 13:52:55 -0700
committerhwc4872012-05-11 13:52:55 -0700
commit137bfc9d4c41cc918d969565bec28a834fe10472 (patch)
treee9fa109fc65218f45e386df48b713ff5858f3d62 /js/components/tools-properties/brush-properties.reel/brush-properties.html
parentd21aaca3d7093b6af968b7f9f764ab54e004f02b (diff)
parent27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff)
downloadninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js
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>