5 files changed, 8 insertions, 59 deletions

diff --git a/js/components/colorwheel.reel/compass_app_log.txt b/js/components/colorwheel.reel/compass_app_log.txt
deleted file mode 100755
index 815feb02..00000000
--- a/js/components/colorwheel.reel/compass_app_log.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-2011-11-23 01:07:12    create css/colorwheel.css
-2011-11-23 01:07:25 overwrite css/colorwheel.css
-2011-12-20 17:04:05 overwrite css/colorwheel.css
diff --git a/js/components/popup.reel/compass_app_log.txt b/js/components/popup.reel/compass_app_log.txt
deleted file mode 100755
index 8a3fb984..00000000
--- a/js/components/popup.reel/compass_app_log.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-2011-06-28 18:13:06    create css/popup.css
-2011-06-28 18:13:12 identical css/popup.css
-2011-06-28 18:14:08 overwrite css/popup.css
-2011-06-28 18:14:20 overwrite css/popup.css
-2011-06-28 18:14:29 overwrite css/popup.css
-2011-06-28 18:17:23 overwrite css/popup.css
-2011-06-28 18:17:27 overwrite css/popup.css
-2011-06-28 18:17:56 overwrite css/popup.css
-2011-06-28 18:18:09 overwrite css/popup.css
-2011-06-28 18:20:30 overwrite css/popup.css
-2011-06-28 18:22:35 overwrite css/popup.css
-2011-06-28 18:24:12 overwrite css/popup.css
-2011-06-28 18:24:23 overwrite css/popup.css
-2011-06-28 18:24:33 overwrite css/popup.css
-2011-06-28 18:25:17 overwrite css/popup.css
-2011-06-28 18:26:21 overwrite css/popup.css
-2011-06-28 18:26:33 overwrite css/popup.css
-2011-06-28 18:26:42 overwrite css/popup.css
-2011-06-28 18:26:57 overwrite css/popup.css
-2011-06-28 18:29:57 overwrite css/popup.css
-2011-06-28 18:30:14 overwrite css/popup.css
-2011-06-28 18:30:23 overwrite css/popup.css
-2011-06-28 18:30:48 overwrite css/popup.css
-2011-06-28 18:31:03 overwrite css/popup.css
-2011-06-29 10:18:31 overwrite css/popup.css
-2011-06-29 10:18:47 overwrite css/popup.css
-2011-06-29 10:37:19 overwrite css/popup.css
-2011-06-29 10:40:29 overwrite css/popup.css
-2011-06-29 10:45:37 overwrite css/popup.css
-2011-06-29 10:45:53 identical css/popup.css
-2011-06-29 10:46:52 overwrite css/popup.css
-2011-06-29 10:47:02 identical css/popup.css
-2011-06-29 13:30:47 overwrite css/popup.css
-2011-06-29 13:31:14 overwrite css/popup.css
-2011-12-20 17:06:48 overwrite css/popup.css
-2011-12-22 11:29:15 overwrite css/popup.css
-2011-12-22 11:29:24 identical css/popup.css
-2011-12-22 11:30:05 overwrite css/popup.css
-2011-12-22 11:30:33 overwrite css/popup.css
-2011-12-22 11:30:51 overwrite css/popup.css
-2011-12-22 11:32:30 overwrite css/popup.css
-2011-12-22 11:33:06 overwrite css/popup.css
-2011-12-22 11:33:12 overwrite css/popup.css
-2011-12-22 11:33:32 identical css/popup.css
-2011-12-22 11:33:36 overwrite css/popup.css
-2011-12-22 11:34:48 overwrite css/popup.css
-2012-01-26 11:42:18 overwrite css/popup.css
-2012-01-26 11:42:20 overwrite css/popup.css
diff --git a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
index 9a27689a..ff738bbe 100755
--- a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
+++ b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
@@ -1499,13 +1499,13 @@ exports.ColorPanelBase = Montage.create(Component, {
                                 //
                                 if (type._event.clientX && type._event.clientY) {
                                         //
-                                        if (type._event.clientX > (parseInt(document.width)/2)) {
+                                        //if (type._event.clientX > (parseInt(document.width)/2)) {
                                                 //TODO: Fix offset hack
                                                 this.application.ninja.colorController.colorPopupManager.showColorPopup((type._event.clientX - type._event.offsetX) +'px', (type._event.target.clientHeight/2+type._event.clientY - type._event.offsetY)+'px', 'right', 'top');
-                                        } else {
+                                        //} else {
                                                 //
-                                                this.application.ninja.colorController.colorPopupManager.showColorPopup((type._event.clientX - type._event.offsetX)+parseInt(type._event.target.offsetWidth)+'px', (type._event.target.offsetHeight/2+type._event.clientY - type._event.offsetY)+'px', 'left', 'top');
-                                        }
+                                        //      this.application.ninja.colorController.colorPopupManager.showColorPopup((type._event.clientX - type._event.offsetX)+parseInt(type._event.target.offsetWidth)+'px', (type._event.target.offsetHeight/2+type._event.clientY - type._event.offsetY)+'px', 'left', 'top');
+                                        //}
                                 }
                         }
                 } else {
diff --git a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css
index 6a418279..4db0abff 100755
--- a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css
+++ b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css
@@ -6,7 +6,7 @@
  </copyright> */
 /* line 12, colorpanelpopup.scss */
 .cpp_popup {
-  overflow: none;
+  overflow: hidden;
   font-size: 12px;
   text-shadow: 1px 1px 1px #000;
   font-family: 'Droid Sans', sans-serif;
@@ -28,7 +28,7 @@
   text-indent: -9999px;
   overflow: hidden;
   float: right;
-  padding: none;
+  padding: 0;
   cursor: pointer;
   border: 1px solid transparent;
 }
diff --git a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss
index 20481fb6..1f63658a 100755
--- a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss
+++ b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss
@@ -10,7 +10,7 @@ $grey_light: #494949;
 
 .cpp_popup
 {
-        overflow: none;
+        overflow: hidden;
         font-size: 12px;
         text-shadow: 1px 1px 1px #000;
         font-family: 'Droid Sans', sans-serif;
@@ -32,7 +32,7 @@ $grey_light: #494949;
         text-indent: -9999px;
         overflow: hidden;
         float: right;
-        padding: none;
+        padding: 0;
         cursor: pointer;
         border: 1px solid transparent;
 }