aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Color
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Color')
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorbutton-manager.js0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scsscbin15335 -> 15335 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scsscbin17879 -> 17879 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scsscbin23592 -> 23592 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorchippopup.reel/colorchippopup.html0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorchippopup.reel/colorchippopup.js0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorchippopup.reel/css/colorchippopup.css0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorchippopup.reel/img/icon_bitmap.pngbin3072 -> 3072 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorchippopup.reel/img/icon_colorwheel.pngbin3420 -> 3420 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorchippopup.reel/img/icon_gradient.pngbin2815 -> 2815 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorchippopup.reel/img/icon_nofill.pngbin2951 -> 2951 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorchippopup.reel/img/knob.pngbin1036 -> 1036 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanel.js0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelbase.reel/colorpanelbase.html0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelbase.reel/colorpanelbase.js8
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelbase.reel/img/icon_default.pngbin3011 -> 3011 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelbase.reel/img/icon_nocolor.pngbin3036 -> 3036 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelbase.reel/img/icon_swap.pngbin2961 -> 2961 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelbase.reel/img/knob.pngbin1036 -> 1036 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelpopup.reel/colorpanelpopup.html0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css4
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss4
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelpopup.reel/img/icon_bitmap.pngbin3072 -> 3072 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelpopup.reel/img/icon_colorwheel.pngbin3420 -> 3420 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelpopup.reel/img/icon_gradient.pngbin2815 -> 2815 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelpopup.reel/img/icon_nofill.pngbin2951 -> 2951 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelpopup.reel/img/knob.pngbin1036 -> 1036 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpopup-manager.js0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colortoolbar.reel/colortoolbar.html0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colortoolbar.reel/colortoolbar.js0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colortoolbar.reel/css/colortoolbar.css0
33 files changed, 8 insertions, 8 deletions
diff --git a/js/panels/Color/colorbutton-manager.js b/js/panels/Color/colorbutton-manager.js
index a189d040..a189d040 100644..100755
--- a/js/panels/Color/colorbutton-manager.js
+++ b/js/panels/Color/colorbutton-manager.js
diff --git a/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc b/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc
index aa8bf258..aa8bf258 100644..100755
--- a/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc
+++ b/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc
Binary files differ
diff --git a/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc b/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc
index fca60390..fca60390 100644..100755
--- a/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc
+++ b/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc
Binary files differ
diff --git a/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc b/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc
index fd7938d8..fd7938d8 100644..100755
--- a/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc
+++ b/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc
Binary files differ
diff --git a/js/panels/Color/colorchippopup.reel/colorchippopup.html b/js/panels/Color/colorchippopup.reel/colorchippopup.html
index 1ae40cc1..1ae40cc1 100644..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 100644..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/css/colorchippopup.css b/js/panels/Color/colorchippopup.reel/css/colorchippopup.css
index 514c8e9f..514c8e9f 100644..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/img/icon_bitmap.png b/js/panels/Color/colorchippopup.reel/img/icon_bitmap.png
index 3d6bf1fb..3d6bf1fb 100644..100755
--- a/js/panels/Color/colorchippopup.reel/img/icon_bitmap.png
+++ b/js/panels/Color/colorchippopup.reel/img/icon_bitmap.png
Binary files differ
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 100644..100755
--- a/js/panels/Color/colorchippopup.reel/img/icon_colorwheel.png
+++ b/js/panels/Color/colorchippopup.reel/img/icon_colorwheel.png
Binary files differ
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 100644..100755
--- a/js/panels/Color/colorchippopup.reel/img/icon_gradient.png
+++ b/js/panels/Color/colorchippopup.reel/img/icon_gradient.png
Binary files differ
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 100644..100755
--- a/js/panels/Color/colorchippopup.reel/img/icon_nofill.png
+++ b/js/panels/Color/colorchippopup.reel/img/icon_nofill.png
Binary files differ
diff --git a/js/panels/Color/colorchippopup.reel/img/knob.png b/js/panels/Color/colorchippopup.reel/img/knob.png
index ecfbfcec..ecfbfcec 100644..100755
--- a/js/panels/Color/colorchippopup.reel/img/knob.png
+++ b/js/panels/Color/colorchippopup.reel/img/knob.png
Binary files differ
diff --git a/js/panels/Color/colorpanel.js b/js/panels/Color/colorpanel.js
index 4858be68..4858be68 100644..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 100644..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 9a27689a..ff738bbe 100644..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, {
1499 // 1499 //
1500 if (type._event.clientX && type._event.clientY) { 1500 if (type._event.clientX && type._event.clientY) {
1501 // 1501 //
1502 if (type._event.clientX > (parseInt(document.width)/2)) { 1502 //if (type._event.clientX > (parseInt(document.width)/2)) {
1503 //TODO: Fix offset hack 1503 //TODO: Fix offset hack
1504 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'); 1504 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');
1505 } else { 1505 //} else {
1506 // 1506 //
1507 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'); 1507 // 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');
1508 } 1508 //}
1509 } 1509 }
1510 } 1510 }
1511 } else { 1511 } else {
diff --git a/js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css b/js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css
index e4a0aa12..e4a0aa12 100644..100755
--- a/js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css
+++ b/js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css
diff --git a/js/panels/Color/colorpanelbase.reel/img/icon_default.png b/js/panels/Color/colorpanelbase.reel/img/icon_default.png
index 8e64991f..8e64991f 100644..100755
--- a/js/panels/Color/colorpanelbase.reel/img/icon_default.png
+++ b/js/panels/Color/colorpanelbase.reel/img/icon_default.png
Binary files differ
diff --git a/js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png b/js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png
index 17164935..17164935 100644..100755
--- a/js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png
+++ b/js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png
Binary files differ
diff --git a/js/panels/Color/colorpanelbase.reel/img/icon_swap.png b/js/panels/Color/colorpanelbase.reel/img/icon_swap.png
index c2c1681d..c2c1681d 100644..100755
--- a/js/panels/Color/colorpanelbase.reel/img/icon_swap.png
+++ b/js/panels/Color/colorpanelbase.reel/img/icon_swap.png
Binary files differ
diff --git a/js/panels/Color/colorpanelbase.reel/img/knob.png b/js/panels/Color/colorpanelbase.reel/img/knob.png
index ecfbfcec..ecfbfcec 100644..100755
--- a/js/panels/Color/colorpanelbase.reel/img/knob.png
+++ b/js/panels/Color/colorpanelbase.reel/img/knob.png
Binary files differ
diff --git a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.html b/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.html
index feebb45c..feebb45c 100644..100755
--- a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.html
+++ b/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.html
diff --git a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js b/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
index 299e603d..299e603d 100644..100755
--- a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
+++ b/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
diff --git a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css
index 6a418279..4db0abff 100644..100755
--- a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css
+++ b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css
@@ -6,7 +6,7 @@
6 </copyright> */ 6 </copyright> */
7/* line 12, colorpanelpopup.scss */ 7/* line 12, colorpanelpopup.scss */
8.cpp_popup { 8.cpp_popup {
9 overflow: none; 9 overflow: hidden;
10 font-size: 12px; 10 font-size: 12px;
11 text-shadow: 1px 1px 1px #000; 11 text-shadow: 1px 1px 1px #000;
12 font-family: 'Droid Sans', sans-serif; 12 font-family: 'Droid Sans', sans-serif;
@@ -28,7 +28,7 @@
28 text-indent: -9999px; 28 text-indent: -9999px;
29 overflow: hidden; 29 overflow: hidden;
30 float: right; 30 float: right;
31 padding: none; 31 padding: 0;
32 cursor: pointer; 32 cursor: pointer;
33 border: 1px solid transparent; 33 border: 1px solid transparent;
34} 34}
diff --git a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss
index 20481fb6..1f63658a 100644..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;
10 10
11.cpp_popup 11.cpp_popup
12{ 12{
13 overflow: none; 13 overflow: hidden;
14 font-size: 12px; 14 font-size: 12px;
15 text-shadow: 1px 1px 1px #000; 15 text-shadow: 1px 1px 1px #000;
16 font-family: 'Droid Sans', sans-serif; 16 font-family: 'Droid Sans', sans-serif;
@@ -32,7 +32,7 @@ $grey_light: #494949;
32 text-indent: -9999px; 32 text-indent: -9999px;
33 overflow: hidden; 33 overflow: hidden;
34 float: right; 34 float: right;
35 padding: none; 35 padding: 0;
36 cursor: pointer; 36 cursor: pointer;
37 border: 1px solid transparent; 37 border: 1px solid transparent;
38} 38}
diff --git a/js/panels/Color/colorpanelpopup.reel/img/icon_bitmap.png b/js/panels/Color/colorpanelpopup.reel/img/icon_bitmap.png
index 3d6bf1fb..3d6bf1fb 100644..100755
--- a/js/panels/Color/colorpanelpopup.reel/img/icon_bitmap.png
+++ b/js/panels/Color/colorpanelpopup.reel/img/icon_bitmap.png
Binary files differ
diff --git a/js/panels/Color/colorpanelpopup.reel/img/icon_colorwheel.png b/js/panels/Color/colorpanelpopup.reel/img/icon_colorwheel.png
index a2850f4f..a2850f4f 100644..100755
--- a/js/panels/Color/colorpanelpopup.reel/img/icon_colorwheel.png
+++ b/js/panels/Color/colorpanelpopup.reel/img/icon_colorwheel.png
Binary files differ
diff --git a/js/panels/Color/colorpanelpopup.reel/img/icon_gradient.png b/js/panels/Color/colorpanelpopup.reel/img/icon_gradient.png
index 887eee13..887eee13 100644..100755
--- a/js/panels/Color/colorpanelpopup.reel/img/icon_gradient.png
+++ b/js/panels/Color/colorpanelpopup.reel/img/icon_gradient.png
Binary files differ
diff --git a/js/panels/Color/colorpanelpopup.reel/img/icon_nofill.png b/js/panels/Color/colorpanelpopup.reel/img/icon_nofill.png
index 0c6311a0..0c6311a0 100644..100755
--- a/js/panels/Color/colorpanelpopup.reel/img/icon_nofill.png
+++ b/js/panels/Color/colorpanelpopup.reel/img/icon_nofill.png
Binary files differ
diff --git a/js/panels/Color/colorpanelpopup.reel/img/knob.png b/js/panels/Color/colorpanelpopup.reel/img/knob.png
index ecfbfcec..ecfbfcec 100644..100755
--- a/js/panels/Color/colorpanelpopup.reel/img/knob.png
+++ b/js/panels/Color/colorpanelpopup.reel/img/knob.png
Binary files differ
diff --git a/js/panels/Color/colorpopup-manager.js b/js/panels/Color/colorpopup-manager.js
index a4c9a8c2..a4c9a8c2 100644..100755
--- a/js/panels/Color/colorpopup-manager.js
+++ b/js/panels/Color/colorpopup-manager.js
diff --git a/js/panels/Color/colortoolbar.reel/colortoolbar.html b/js/panels/Color/colortoolbar.reel/colortoolbar.html
index 9ab54836..9ab54836 100644..100755
--- a/js/panels/Color/colortoolbar.reel/colortoolbar.html
+++ b/js/panels/Color/colortoolbar.reel/colortoolbar.html
diff --git a/js/panels/Color/colortoolbar.reel/colortoolbar.js b/js/panels/Color/colortoolbar.reel/colortoolbar.js
index 6b8e476b..6b8e476b 100644..100755
--- a/js/panels/Color/colortoolbar.reel/colortoolbar.js
+++ b/js/panels/Color/colortoolbar.reel/colortoolbar.js
diff --git a/js/panels/Color/colortoolbar.reel/css/colortoolbar.css b/js/panels/Color/colortoolbar.reel/css/colortoolbar.css
index 759ef4f8..759ef4f8 100644..100755
--- a/js/panels/Color/colortoolbar.reel/css/colortoolbar.css
+++ b/js/panels/Color/colortoolbar.reel/css/colortoolbar.css