diff options
| author | Valerio Virgillito | 2012-05-16 16:06:56 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-05-16 16:06:56 -0700 |
| commit | 92fcb770aff434e994e7a39a61d8fac4a017dca0 (patch) | |
| tree | e385beee8f2694596f6305bf90eb7eb4521de2e2 /js/components/tools-properties/brush-properties.reel/brush-properties.html | |
| parent | bdd4b24c9e738c65ab8f6f9942358c59fe60edf1 (diff) | |
| parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
| download | ninja-92fcb770aff434e994e7a39a61d8fac4a017dca0.tar.gz | |
Merge branch 'refs/heads/master' into dom-architecture
Conflicts:
js/document/templates/montage-html/package.json
js/io/system/ninjalibrary.json
node_modules/descriptor.json
Signed-off-by: Valerio Virgillito <valerio@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 | 27 |
1 files changed, 14 insertions, 13 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 e7aaf0e8..7d99a42a 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.html +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html | |||
| @@ -64,6 +64,7 @@ | |||
| 64 | "prototype": "js/components/tools-properties/brush-properties.reel", | 64 | "prototype": "js/components/tools-properties/brush-properties.reel", |
| 65 | "properties": { | 65 | "properties": { |
| 66 | "element": {"#": "brushProperties"}, | 66 | "element": {"#": "brushProperties"}, |
| 67 | "_fillColorCtrl": {"#": "fillColorCtrl"}, | ||
| 67 | "_strokeSize": {"@": "strokeSizeHT"}, | 68 | "_strokeSize": {"@": "strokeSizeHT"}, |
| 68 | "_strokeHardness": {"@": "strokeHardnessHT"}, | 69 | "_strokeHardness": {"@": "strokeHardnessHT"}, |
| 69 | "_doSmoothing": {"#": "doSmoothing"}, | 70 | "_doSmoothing": {"#": "doSmoothing"}, |
| @@ -79,19 +80,19 @@ | |||
| 79 | </head> | 80 | </head> |
| 80 | 81 | ||
| 81 | <body> | 82 | <body> |
| 82 | <div data-montage-id="brushProperties" class="subToolHolderPanel"> | 83 | <div data-montage-id="brushProperties" class="subToolHolderPanel toolOptionsFloatChildren"> |
| 83 | <div data-montage-id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> | 84 | <div class="toolColorChipIcon FillTool"></div> |
| 84 | <label class="label"> Width:</label> | 85 | <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> |
| 85 | <div data-montage-id="strokeSize" class="label"></div> | 86 | <div class="nj-divider divider-vertical"> </div> |
| 86 | <label class="label"> Hardness:</label> | 87 | <label class="label"> Width:</label> |
| 87 | <div data-montage-id="strokeHardness" class="label"></div> | 88 | <div data-montage-id="strokeSize" class="label"></div> |
| 88 | <label class="label"><input id="doSmoothing" type="checkbox" name="doSmoothingControl" class="checkBoxAlign"/>Smoothing</label> | 89 | <label class="label"> Hardness:</label> |
| 89 | <div data-montage-id="smoothingAmount" class="label"></div> | 90 | <div data-montage-id="strokeHardness" class="label"></div> |
| 90 | <label class="label"><input id="useCalligraphic" type="checkbox" name="useCalligraphicControl" class="checkBoxAlign"/>Calligraphic</label> | 91 | <input data-montage-id="doSmoothing" type="checkbox" name="doSmoothingControl" class="nj-skinned"/><label class="label">Smoothing</label> |
| 91 | <label class="label" id="angleLabel"> Angle:</label> | 92 | <div data-montage-id="smoothingAmount" class="label"></div> |
| 92 | <div data-montage-id="strokeAngle" class="label"></div> | 93 | <input data-montage-id="useCalligraphic" type="checkbox" name="useCalligraphicControl" class="nj-skinned"/><label class="label">Calligraphic</label> |
| 93 | 94 | <label data-montage-id="angleLabel" class="label"">Angle:</label> | |
| 94 | </div> | 95 | <div data-montage-id="strokeAngle" class="label"></div> |
| 95 | </div> | 96 | </div> |
| 96 | </body> | 97 | </body> |
| 97 | 98 | ||