diff options
author | Pushkar Joshi | 2012-05-07 11:00:22 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-05-07 11:00:22 -0700 |
commit | e5ae6e0b6e54db0e6efd75d1f14cb791060ed67a (patch) | |
tree | e84d2dc5033c1b5c1b993662660a90af12584b69 /js/components/tools-properties/brush-properties.reel/brush-properties.html | |
parent | ba890518b5a35d5e6893f9fc72d2eee30ae07e17 (diff) | |
parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
download | ninja-e5ae6e0b6e54db0e6efd75d1f14cb791060ed67a.tar.gz |
Merge branch 'master' into pentool
Diffstat (limited to 'js/components/tools-properties/brush-properties.reel/brush-properties.html')
-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> |