diff options
| author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
| commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
| tree | 867f8bdd588c8f9076979233ca46a688ff70523e /js/components/tools-properties/brush-properties.reel/brush-properties.html | |
| parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
| parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
| download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
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> |