diff options
| author | John Mayhew | 2012-05-07 14:30:47 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-05-07 14:30:47 -0700 |
| commit | 29ad6355ef60cfb3b3fc7f780504f3ed30845883 (patch) | |
| tree | bbe2dcd46c98db8138ad0a8f0263ef33324d7669 /js/components/tools-properties/brush-properties.reel/brush-properties.html | |
| parent | 1a759361b82127f9d5c1428dc889fffdf2daaf86 (diff) | |
| download | ninja-29ad6355ef60cfb3b3fc7f780504f3ed30845883.tar.gz | |
More implementation of moving color chips to the individual subtools.
Removed the tool color bar
Added new icons for inkbottle
Removed Pencil tool
Removed Inkbottle tool
Added chips to the pen, brush and tag tools
Aligned controls in several subtools
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 | 29 |
1 files changed, 15 insertions, 14 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..e4cd69b8 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"}, |
| @@ -74,24 +75,24 @@ | |||
| 74 | } | 75 | } |
| 75 | } | 76 | } |
| 76 | } | 77 | } |
| 77 | </script> | 78 | </script> |
| 78 | 79 | ||
| 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 optionsBrushTool"> |
| 83 | <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> | 84 | <div class="colorCtrlIcon FillTool"></div> |
| 84 | <label class="label"> Width:</label> | 85 | <div data-montage-id="fillColorCtrl" class="fillColorCtrl"></div> |
| 85 | <div 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 id="strokeHardness" class="label"></div> | 88 | <div 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 id="smoothingAmount" class="label"></div> | 90 | <div id="strokeHardness" class="label"></div> |
| 90 | <label class="label"><input id="useCalligraphic" type="checkbox" name="useCalligraphicControl" class="checkBoxAlign"/>Calligraphic</label> | 91 | <input id="doSmoothing" type="checkbox" name="doSmoothingControl" class="nj-skinned"/><label class="label">Smoothing</label> |
| 91 | <label class="label" id="angleLabel"> Angle:</label> | 92 | <div id="smoothingAmount" class="label"></div> |
| 92 | <div id="strokeAngle" class="label"></div> | 93 | <input id="useCalligraphic" type="checkbox" name="useCalligraphicControl" class="nj-skinned"/><label class="label">Calligraphic</label> |
| 93 | 94 | <label class="label" id="angleLabel">Angle:</label> | |
| 94 | </div> | 95 | <div id="strokeAngle" class="label"></div> |
| 95 | </div> | 96 | </div> |
| 96 | </body> | 97 | </body> |
| 97 | 98 | ||