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

1 files changed, 4 insertions, 4 deletions

diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.html b/js/components/tools-properties/shape-properties.reel/shape-properties.html
index d3faab75..3c492e6e 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.html
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html
@@ -136,11 +136,11 @@
             <div id="shapeToolsList">
                 <div id="toolbutton"></div>
             </div>
-            <div data-montage-id="fillColorCtrlIcon" class="colorCtrlIcon FillTool"></div>
-            <div data-montage-id="fillColorCtrl" class="fillColorCtrl"></div>
             <div class="colorCtrlIcon PencilTool"></div>
             <div data-montage-id="strokeColorCtrl" class="strokeColorCtrl"></div>
-
+            <div data-montage-id="fillColorCtrlIcon" class="colorCtrlIcon FillTool"></div>
+            <div data-montage-id="fillColorCtrl" class="fillColorCtrl"></div>
+            <div class="nj-divider divider-vertical">&nbsp;</div>
             <label class="label">Stroke:</label>
             <div id="strokeControl" class="label"></div>
             <div id="customProperties">
@@ -149,7 +149,7 @@
                 <div id="lineProperties" class="label"></div>
             </div>
 
-            <label class="label subOption optionLabel"><input id="useWebGLCH" type="checkbox" name="useWebGLControl" class="checkBoxAlign"/>Use WebGL</label>
+            <label class="label subOption optionLabel"><input id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/>Use WebGL</label>
 
             <label id="materialLabel" class="label">Material:</label>
             <div id="strokeIcon" class="pencilToolUp" style="float: left;"></div>