13 files changed, 55 insertions, 20 deletions

diff --git a/css/ninja.css b/css/ninja.css
index 20fa85f5..62642787 100644
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -860,9 +860,11 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
 
 .InkBottleTool { background-image: url("../images/tools/Tool-FillColor.png"); }
 
+.toolsList .colortoolbar { padding-left: 1px; padding-top: 4px; }
+
 .toolsList .colortoolbar button { width: 27px; height: 27px; background: black; border: 1px solid #000; padding: 0; margin: 0px; }
 
-.toolsList .colortoolbar div { width: 27px; height: 27px; margin: 0; }
+.toolsList .colortoolbar div { width: 27px; height: 27px; margin: 0; margin-top: 3px; }
 
 .toolsList .colortoolbar div.cpe_colortoolbar_container { margin: 0; }
 
@@ -985,4 +987,6 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
 
 .montage-popup-container { background: none; }
 
+.montage-invisible { display: none; }
+
 /*77*/
diff --git a/images/tools/Tool-EyeDropper.png b/images/tools/Tool-EyeDropper.png
index e73e0a79..61ffc7ba 100644
--- a/images/tools/Tool-EyeDropper.png
+++ b/images/tools/Tool-EyeDropper.png
diff --git a/images/tools/Tool-Pan.png b/images/tools/Tool-Pan.png
index 948a6a4c..91906549 100644
--- a/images/tools/Tool-Pan.png
+++ b/images/tools/Tool-Pan.png
diff --git a/images/tools/Tool-Tag.png b/images/tools/Tool-Tag.png
index bae5f0ad..93a441ad 100644
--- a/images/tools/Tool-Tag.png
+++ b/images/tools/Tool-Tag.png
diff --git a/images/tools/Tool-Text.png b/images/tools/Tool-Text.png
index c5d18d63..741dfb65 100644
--- a/images/tools/Tool-Text.png
+++ b/images/tools/Tool-Text.png
diff --git a/images/tools/Tool-Zoom.png b/images/tools/Tool-Zoom.png
index 6abad024..c6b06a6f 100644
--- a/images/tools/Tool-Zoom.png
+++ b/images/tools/Tool-Zoom.png
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index c47359bf..2c5617e5 100644
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -26,15 +26,15 @@
             },
 
             "groupLine": {
-                "module": "js/components/layout/tool-button.reel",
-                "name": "ToolButton",
+                "module": "montage/ui/condition.reel",
+                "name": "Condition",
                 "properties": {
                     "element": {"#": "groupLine"}
                 },
                 "bindings": {
-                    "data": {
+                    "condition": {
                         "boundObject": {"@": "repetition1"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration",
+                        "boundObjectPropertyPath": "objectAtCurrentIteration.lastInGroup",
                         "oneway": true
                     }
                 }
@@ -178,7 +178,9 @@
         <div id="toolsList" class="toolsList">
             <div id="toolscontainer" class="toolscontainer">
                 <div id="toolbutton" class="toolbutton"></div>
-                <hr id="groupLine" />
+                <div id="groupLine">
+                    <hr />
+                </div>
             </div>
             <!-- TODO: Remove and add as a component -->
             <div id="colortoolbar"></div>
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index 8356c422..4847fa7c 100644
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -28,7 +28,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "action":       "SubselectionTool",
                 "toolTip":      "Subselect Tool",
                 "cursor":       "auto",
-                "lastInGroup":  false,
+                "lastInGroup":  true,
                 "container":    false,
                 "selected":     false
             },
@@ -153,7 +153,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "action":       "FillTool",
                 "toolTip":      "Fill Tool",
                 "cursor":       "url('images/tools/bucket_down.png'), default",
-                "lastInGroup":  false,
+                "lastInGroup":  true,
                 "container":    false,
                 "selected":     false
             },
@@ -168,17 +168,17 @@ exports.ToolsData = Montage.create(Montage, {
 //                "container":    false,
 //                "selected":     false
 //            },
-//            {
-//                "id":           "EyedropperTool",
-//                "properties":   "eyedropperProperties",
-//                "spriteSheet":  true,
-//                "action":       "EyedropperTool",
-//                "toolTip":      "Eyedropper Tool",
-//                "cursor":       "url('images/tools/eyedropper_down.png'), default",
-//                "lastInGroup":  false,
-//                "container":    false,
-//                "selected":     false
-//            },
+            {
+                "id":           "EyedropperTool",
+                "properties":   "eyedropperProperties",
+                "spriteSheet":  true,
+                "action":       "EyedropperTool",
+                "toolTip":      "Eyedropper Tool",
+                "cursor":       "url('images/tools/eyedropper_down.png'), default",
+                "lastInGroup":  false,
+                "container":    false,
+                "selected":     false
+            },
 //            {
 //                "id":           "EraserTool",
 //                "properties":   "eraserProperties",
@@ -219,7 +219,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "action":       "ZoomTool",
                 "toolTip":      "Zoom Tool (Z)",
                 "cursor":       "url('images/cursors/zoom.png'),default",
-                "lastInGroup":  false,
+                "lastInGroup":  true,
                 "container":    false,
                 "selected":     false
             }
diff --git a/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_MontageOverrides.scssc b/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_MontageOverrides.scssc
index 02e1f256..ae35faa4 100644
--- a/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_MontageOverrides.scssc
+++ b/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_MontageOverrides.scssc
diff --git a/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_toolbar.scssc b/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_toolbar.scssc
index d5541090..6fc7c8bd 100644
--- a/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_toolbar.scssc
+++ b/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_toolbar.scssc
diff --git a/scss/compass_app_log.txt b/scss/compass_app_log.txt
index ad936de7..c4795cdf 100644
--- a/scss/compass_app_log.txt
+++ b/scss/compass_app_log.txt
@@ -14,3 +14,20 @@
 2012-02-15 13:48:27 overwrite ../css/ninja.css
 2012-02-15 13:49:27 overwrite ../css/ninja.css
 2012-02-15 13:49:35 identical ../css/ninja.css
+2012-02-15 14:37:00     error ninja.scss (Line 232: Invalid CSS after ".montage-invisible": expected "{", was "")
+2012-02-15 14:37:00 overwrite ../css/ninja.css
+2012-02-15 14:44:12     error ninja.scss (Line 232: Invalid CSS after ".montage-invisible": expected "{", was "")
+2012-02-15 14:44:12 identical ../css/ninja.css
+2012-02-15 14:44:15     error ninja.scss (Line 232: Invalid CSS after ".montage-invisible": expected "{", was "")
+2012-02-15 14:44:15 identical ../css/ninja.css
+2012-02-15 14:44:34     error ninja.scss (Line 232: Invalid CSS after ".montage-invisible": expected "{", was "")
+2012-02-15 14:44:34 identical ../css/ninja.css
+2012-02-15 14:44:57 overwrite ../css/ninja.css
+2012-02-15 14:45:37 overwrite ../css/ninja.css
+2012-02-15 14:52:43 overwrite ../css/ninja.css
+2012-02-15 14:52:57 overwrite ../css/ninja.css
+2012-02-15 14:53:28 overwrite ../css/ninja.css
+2012-02-15 14:53:42 overwrite ../css/ninja.css
+2012-02-15 14:54:10 overwrite ../css/ninja.css
+2012-02-15 14:55:22 identical ../css/ninja.css
+2012-02-15 14:55:28 overwrite ../css/ninja.css
diff --git a/scss/imports/scss/_MontageOverrides.scss b/scss/imports/scss/_MontageOverrides.scss
index 65b9ede0..6e728863 100644
--- a/scss/imports/scss/_MontageOverrides.scss
+++ b/scss/imports/scss/_MontageOverrides.scss
@@ -16,4 +16,8 @@
 }
 .montage-popup-container {
     background: none;
+}
+
+.montage-invisible {
+    display: none;
 }
\ No newline at end of file
diff --git a/scss/imports/scss/_toolbar.scss b/scss/imports/scss/_toolbar.scss
index 44178b24..4d460bad 100644
--- a/scss/imports/scss/_toolbar.scss
+++ b/scss/imports/scss/_toolbar.scss
@@ -131,6 +131,11 @@
     background-image:url("../images/tools/Tool-FillColor.png");
 }
 
+.toolsList .colortoolbar {
+    padding-left: 1px;
+    padding-top:4px;
+}
+
 .toolsList .colortoolbar button
 {
         width: 27px;
@@ -146,6 +151,7 @@
         width: 27px;
         height: 27px;
         margin: 0;
+   margin-top:3px;
 }
 
 .toolsList .colortoolbar div.cpe_colortoolbar_container
@@ -153,6 +159,8 @@
         margin: 0;
 }
 
+
+