18 files changed, 172 insertions, 132 deletions

diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index acee20b2..f559e748 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -85,9 +85,6 @@
             "LineTool1": {
                 "prototype": "js/tools/LineTool"
             },
-            "PencilTool1": {
-                "prototype": "js/tools/PencilTool"
-            },
             "BrushTool1": {
                 "prototype": "js/tools/BrushTool"
             },
@@ -97,9 +94,6 @@
             "InkBottleTool1": {
                 "prototype": "js/tools/InkBottleTool"
             },
-            "EyedropperTool1": {
-                "prototype": "js/tools/EyedropperTool"
-            },
             "EraserTool1": {
                 "prototype": "js/tools/EraserTool"
             },
@@ -142,11 +136,9 @@
                     "OvalTool":               {"@": "OvalTool1"},
                     "RectTool":               {"@": "RectTool1"},
                     "LineTool":               {"@": "LineTool1"},
-                    "PencilTool":             {"@": "PencilTool1"},
                     "BrushTool":              {"@": "BrushTool1"},
                     "FillTool":               {"@": "FillTool1"},
                     "InkBottleTool":          {"@": "InkBottleTool1"},
-                    "EyedropperTool":         {"@": "EyedropperTool1"},
                     "EraserTool":             {"@": "EraserTool1"},
                     "RotateStageTool3D":      {"@": "RotateStageTool3D1"},
                     "PanTool":                {"@": "PanTool1"},
@@ -169,8 +161,6 @@
                     <hr />
                 </div>
             </div>
-            <!-- TODO: Remove and add as a component -->
-            <div id="colortoolbar"></div>
             <div id="disabledCondition" class="panelDisabled"></div>
         </div>
 
diff --git a/js/components/layout/tools-list.reel/tools-list.js b/js/components/layout/tools-list.reel/tools-list.js
index d68e8a56..ed4ee45f 100755
--- a/js/components/layout/tools-list.reel/tools-list.js
+++ b/js/components/layout/tools-list.reel/tools-list.js
@@ -20,11 +20,9 @@ exports.ToolsList = Montage.create(Component, {
     OvalTool:               { value: null },
     RectTool:               { value: null },
     LineTool:               { value: null },
-    PencilTool:             { value: null },
     BrushTool:              { value: null },
     FillTool:               { value: null },
     InkBottleTool:          { value: null },
-    EyedropperTool:         { value: null },
     EraserTool:             { value: null },
     RotateStageTool3D:      { value: null },
     PanTool:                { value: null },
@@ -68,10 +66,8 @@ exports.ToolsList = Montage.create(Component, {
             this.OvalTool.options = this.application.ninja.toolsProperties.shapeProperties.ovalProperties;
             this.RectTool.options = this.application.ninja.toolsProperties.shapeProperties.rectProperties;
             this.LineTool.options = this.application.ninja.toolsProperties.shapeProperties.lineProperties;
-            this.PencilTool.options = this.application.ninja.toolsProperties.pencilProperties;
             this.BrushTool.options = this.application.ninja.toolsProperties.brushProperties;
             
-            this.EyedropperTool.options = this.application.ninja.toolsProperties.eyedropperProperties;
             this.EraserTool.options = this.application.ninja.toolsProperties.eraserProperties;
             this.RotateStageTool3D.options = this.application.ninja.toolsProperties.rotateStageProperties;
             this.PanTool.options = this.application.ninja.toolsProperties.panProperties;
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html
index 8dd0f713..c51ab27d 100755
--- a/js/components/layout/tools-properties.reel/tools-properties.html
+++ b/js/components/layout/tools-properties.reel/tools-properties.html
@@ -66,12 +66,6 @@
                     }
                 }
             },
-            "pencilProperties1": {
-                "prototype": "js/components/tools-properties/pencil-properties.reel",
-                "properties": {
-                    "element": {"#": "pencilProperties"}
-                }
-            },
             "brushProperties1": {
                 "prototype": "js/components/tools-properties/brush-properties.reel",
                 "properties": {
@@ -90,12 +84,6 @@
                     "element": {"#": "inkbottleProperties"}
                 }
             },
-            "eyedropperProperties1": {
-                "prototype": "js/components/tools-properties/eyedropper-properties.reel",
-                "properties": {
-                    "element": {"#": "eyedropperProperties"}
-                }
-            },
             "eraserProperties1": {
                 "prototype": "js/components/tools-properties/eraser-properties.reel",
                 "properties": {
@@ -147,11 +135,9 @@
                     "penProperties":                {"@": "penProperties1"},
                     "textProperties":               {"@": "textProperties1"},
                     "shapeProperties":              {"@": "shapeProperties1"},
-                    "pencilProperties":             {"@": "pencilProperties1"},
                     "brushProperties":              {"@": "brushProperties1"},
                     "fillProperties":               {"@": "fillProperties1"},
                     "inkbottleProperties":          {"@": "inkbottleProperties1"},
-                    "eyedropperProperties":         {"@": "eyedropperProperties1"},
                     "eraserProperties":             {"@": "eraserProperties1"},
                     "rotateStageProperties":        {"@": "rotateStageProperties1"},
                     "panProperties":                {"@": "panProperties1"},
@@ -179,11 +165,9 @@
             <div id="penProperties"></div>
             <div id="textProperties"></div>
             <div id="shapeProperties"></div>
-            <div id="pencilProperties"></div>
             <div id="brushProperties"></div>
             <div id="fillProperties"></div>
             <div id="inkbottleProperties"></div>
-            <div id="eyedropperProperties"></div>
             <div id="eraserProperties"></div>
             <div id="rotateStageProperties"></div>
             <div id="panProperties"></div>
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.css b/js/components/tools-properties/brush-properties.reel/brush-properties.css
index 7f1b0f7f..0912dd7e 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.css
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.css
@@ -3,4 +3,26 @@
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
+ 
+ .optionsBrushTool {
+    padding: 6px;
+}
 
+ .optionsBrushTool > * {
+    float:left;
+}