43 files changed, 20 insertions, 20 deletions

diff --git a/js/components/gradientpicker.reel/gradientpicker.js b/js/components/gradientpicker.reel/gradientpicker.js
index da4e8c0f..b10f6624 100755
--- a/js/components/gradientpicker.reel/gradientpicker.js
+++ b/js/components/gradientpicker.reel/gradientpicker.js
@@ -213,21 +213,13 @@ exports.GradientPicker = Montage.create(Component, {
     removeStop: {
         enumerable: false,
         value: function(stop) {
-                //Removing stops
-                this.element._components.stopsContainer.removeChild(stop);
-                //Stopping events related to this current stop
-                this.removeStopMoving();
-                //Resetting stops if less than 2
                 var i, buttons = this.element._components.stopsContainer.getElementsByTagName('button');
-                if (buttons.length < 2) {
-                        //Removing remaining stops prior to resetting
-                        for (i=0; buttons[i]; i++) {
-                                this.element._components.stopsContainer.removeChild(buttons[i].stop);
-                        }
-                        //Nulling then adding defaults
-                        this.value = null;
-                        this.addDefaultStops();
-                        this._dispatchEvent('change', false);
+                //
+                if (buttons.length > 2) {
+                        //Removing stops
+                        this.element._components.stopsContainer.removeChild(stop);
+                        //Stopping events related to this current stop
+                        this.removeStopMoving();
                 }
         }
     },
@@ -327,7 +319,7 @@ exports.GradientPicker = Montage.create(Component, {
                 //
                 this.application.ninja.colorController.colorPopupManager.hideColorChipPopup();
                 //
-                if ((e._event.y+this.hack.y) > this.element._trackY+50 || (e._event.y+this.hack.y) < this.element._trackY) {
+                if ((e._event.y+this.hack.y) > this.element._trackY+70 || (e._event.y+this.hack.y) < this.element._trackY) {
                         this.removeStop(this.currentStop);
                 }
                 //
diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.css b/js/components/treeview/ninja-leaf.reel/ninja-leaf.css
index fedc1d9d..cc8108f6 100644
--- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.css
+++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.css
@@ -3,7 +3,12 @@
  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> */
-
+.treeRoot .branch-label, .treeRoot .leaf-label {
+    margin: 0 8px;
+}
+.treeRoot .leaf-label:hover {
+    margin: 0;
+}
 .treeRoot .leaf-label {
     background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA0AAAANCAIAAAD9iXMrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw%2FeHBhY2tldCBiZWdpbj0i77u%2FIiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8%2BIDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpEQzcwMEU1RjQxM0MxMUUxQUM0MERBNzM1MUVEMUQxMCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpEQzcwMEU2MDQxM0MxMUUxQUM0MERBNzM1MUVEMUQxMCI%2BIDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkRDNzAwRTVENDEzQzExRTFBQzQwREE3MzUxRUQxRDEwIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkRDNzAwRTVFNDEzQzExRTFBQzQwREE3MzUxRUQxRDEwIi8%2BIDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY%2BIDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8%2BUcaK3QAAANFJREFUeNqMULEOREAQdYjvuE%2FYWlSUQqKQ7A%2FsD6n0SoVCFHpRa0SllvgFlpvzZO9OcfGSnbx9M%2FNmMpp2Dw96VVX9L%2FJ93wRrmkZJIKrZcRyK%2Bs25p5%2BU8pK4KCakMAzxL4oCJIqivu8Nw0DDu25ZFtW3ritIkiS0tGVZtm1%2F6rZtu4yr67osSyJBEJx3ybKsbVukOecU4zh2XRfKMAzTNJmYpWxgPM%2BzEIIxRrzrOs%2FzdMyVvyAxTdPxAJFzv%2BeBbz8cfN93kDzPb55ZewkwAF0Ddf6ATSsHAAAAAElFTkSuQmCC);
     background-position: 3px center;
@@ -12,6 +17,11 @@
     cursor: pointer;
     padding: 3px 0 4px;
 }
+.branch .branch .leaf-label:hover {
+    background-color: #333333;
+    background-position: 33px center;
+    padding-left: 53px;
+}
 /* First level */
 .branch .leaf-label {
     padding-left: 25px;
@@ -26,4 +36,4 @@
 .branch .branch .branch .leaf-label {
     background-position: 45px center;
     padding-left: 65px;
-}
\ No newline at end of file
+}
diff --git a/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc b/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc
deleted file mode 100755
index aa8bf258..00000000
--- a/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc
+++ /dev/null
diff --git a/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc b/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc
deleted file mode 100755
index fca60390..00000000
--- a/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc
+++ /dev/null
diff --git a/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc b/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc
deleted file mode 100755
index fd7938d8..00000000
--- a/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc
+++ /dev/null
diff --git a/js/panels/Color/colorbutton-manager.js b/js/panels/color/colorbutton-manager.js
index a189d040..a189d040 100755
--- a/js/panels/Color/colorbutton-manager.js
+++ b/js/panels/color/colorbutton-manager.js
diff --git a/js/panels/Color/colorchippopup.reel/colorchippopup.html b/js/panels/color/colorchippopup.reel/colorchippopup.html
index 1ae40cc1..1ae40cc1 100755
--- a/js/panels/Color/colorchippopup.reel/colorchippopup.html
+++ b/js/panels/color/colorchippopup.reel/colorchippopup.html
diff --git a/js/panels/Color/colorchippopup.reel/colorchippopup.js b/js/panels/color/colorchippopup.reel/colorchippopup.js
index 05bcb447..05bcb447 100755
--- a/js/panels/Color/colorchippopup.reel/colorchippopup.js
+++ b/js/panels/color/colorchippopup.reel/colorchippopup.js
diff --git a/js/panels/Color/colorchippopup.reel/config.rb b/js/panels/color/colorchippopup.reel/config.rb
index 9b55af19..9b55af19 100755
--- a/js/panels/Color/colorchippopup.reel/config.rb
+++ b/js/panels/color/colorchippopup.reel/config.rb
diff --git a/js/panels/Color/colorchippopup.reel/css/colorchippopup.css b/js/panels/color/colorchippopup.reel/css/colorchippopup.css
index 514c8e9f..514c8e9f 100755
--- a/js/panels/Color/colorchippopup.reel/css/colorchippopup.css
+++ b/js/panels/color/colorchippopup.reel/css/colorchippopup.css
diff --git a/js/panels/Color/colorchippopup.reel/css/colorchippopup.scss b/js/panels/color/colorchippopup.reel/css/colorchippopup.scss
index d108c1a8..d108c1a8 100755
--- a/js/panels/Color/colorchippopup.reel/css/colorchippopup.scss
+++ b/js/panels/color/colorchippopup.reel/css/colorchippopup.scss
diff --git a/js/panels/Color/colorchippopup.reel/img/icon_bitmap.png b/js/panels/color/colorchippopup.reel/img/icon_bitmap.png
index 3d6bf1fb..3d6bf1fb 100755
--- a/js/panels/Color/colorchippopup.reel/img/icon_bitmap.png
+++ b/js/panels/color/colorchippopup.reel/img/icon_bitmap.png
diff --git a/js/panels/Color/colorchippopup.reel/img/icon_colorwheel.png b/js/panels/color/colorchippopup.reel/img/icon_colorwheel.png
index a2850f4f..a2850f4f 100755
--- a/js/panels/Color/colorchippopup.reel/img/icon_colorwheel.png
+++ b/js/panels/color/colorchippopup.reel/img/icon_colorwheel.png
diff --git a/js/panels/Color/colorchippopup.reel/img/icon_gradient.png b/js/panels/color/colorchippopup.reel/img/icon_gradient.png
index 887eee13..887eee13 100755
--- a/js/panels/Color/colorchippopup.reel/img/icon_gradient.png
+++ b/js/panels/color/colorchippopup.reel/img/icon_gradient.png
diff --git a/js/panels/Color/colorchippopup.reel/img/icon_nofill.png b/js/panels/color/colorchippopup.reel/img/icon_nofill.png
index 0c6311a0..0c6311a0 100755
--- a/js/panels/Color/colorchippopup.reel/img/icon_nofill.png
+++ b/js/panels/color/colorchippopup.reel/img/icon_nofill.png
diff --git a/js/panels/Color/colorchippopup.reel/img/knob.png b/js/panels/color/colorchippopup.reel/img/knob.png
index ecfbfcec..ecfbfcec 100755
--- a/js/panels/Color/colorchippopup.reel/img/knob.png
+++ b/js/panels/color/colorchippopup.reel/img/knob.png
diff --git a/js/panels/Color/colorpanel.js b/js/panels/color/colorpanel.js
index 3a603e98..3a603e98 100755
--- a/js/panels/Color/colorpanel.js
+++ b/js/panels/color/colorpanel.js
diff --git a/js/panels/Color/colorpanelbase.reel/colorpanelbase.html b/js/panels/color/colorpanelbase.reel/colorpanelbase.html
index d4330596..d4330596 100755
--- a/js/panels/Color/colorpanelbase.reel/colorpanelbase.html
+++ b/js/panels/color/colorpanelbase.reel/colorpanelbase.html
diff --git a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js b/js/panels/color/colorpanelbase.reel/colorpanelbase.js
index af62dd07..af62dd07 100755
--- a/