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/pen-properties.reel/pen-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/pen-properties.reel/pen-properties.html')
-rwxr-xr-x | js/components/tools-properties/pen-properties.reel/pen-properties.html | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html index 176663df..9bae188e 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.html +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html | |||
@@ -40,10 +40,11 @@ | |||
40 | 40 | ||
41 | <body> | 41 | <body> |
42 | <div data-montage-id="penProperties" class="subToolHolderPanel optionsPenTool"> | 42 | <div data-montage-id="penProperties" class="subToolHolderPanel optionsPenTool"> |
43 | <div class="colorCtrlIcon FillTool"></div> | ||
44 | <div data-montage-id="fillColorCtrl" class="fillColorCtrl"></div> | ||
45 | <div class="colorCtrlIcon PencilTool"></div> | 43 | <div class="colorCtrlIcon PencilTool"></div> |
46 | <div data-montage-id="strokeColorCtrl" class="strokeColorCtrl"></div> | 44 | <div data-montage-id="strokeColorCtrl" class="strokeColorCtrl"></div> |
45 | <div class="colorCtrlIcon FillTool"></div> | ||
46 | <div data-montage-id="fillColorCtrl" class="fillColorCtrl"></div> | ||
47 | <div class="nj-divider divider-vertical"> </div> | ||
47 | <label class="label"> Stroke:</label> | 48 | <label class="label"> Stroke:</label> |
48 | <div id="strokeSize" class="label"></div> | 49 | <div id="strokeSize" class="label"></div> |
49 | </div> | 50 | </div> |