diff options
author | Valerio Virgillito | 2012-02-13 15:06:32 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-13 15:06:32 -0800 |
commit | feb38c70d6762a9cde982af04c2e37a0a2dcade5 (patch) | |
tree | 9cae059035ad5cf981aeebdbc3d5f88790ad13bc | |
parent | 0d7d6d4d98437a93f31ededa14ca6eb5382c9e58 (diff) | |
parent | 7b0910720a6979bf41c216c5072d5c7a91e6d0b7 (diff) | |
download | ninja-feb38c70d6762a9cde982af04c2e37a0a2dcade5.tar.gz |
Merge branch 'refs/heads/master' into stage-color
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 100644 index 815feb02..00000000 --- a/js/components/colorwheel.reel/compass_app_log.txt +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | 2011-11-23 01:07:12 create css/colorwheel.css | ||
2 | 2011-11-23 01:07:25 overwrite css/colorwheel.css | ||
3 | 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 100644 index 8a3fb984..00000000 --- a/js/components/popup.reel/compass_app_log.txt +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | 2011-06-28 18:13:06 create css/popup.css | ||
2 | 2011-06-28 18:13:12 identical css/popup.css | ||
3 | 2011-06-28 18:14:08 overwrite css/popup.css | ||
4 | 2011-06-28 18:14:20 overwrite css/popup.css | ||
5 | 2011-06-28 18:14:29 overwrite css/popup.css | ||
6 | 2011-06-28 18:17:23 overwrite css/popup.css | ||
7 | 2011-06-28 18:17:27 overwrite css/popup.css | ||
8 | 2011-06-28 18:17:56 overwrite css/popup.css | ||
9 | 2011-06-28 18:18:09 overwrite css/popup.css | ||
10 | 2011-06-28 18:20:30 overwrite css/popup.css | ||
11 | 2011-06-28 18:22:35 overwrite css/popup.css | ||
12 | 2011-06-28 18:24:12 overwrite css/popup.css | ||
13 | 2011-06-28 18:24:23 overwrite css/popup.css | ||
14 | 2011-06-28 18:24:33 overwrite css/popup.css | ||
15 | 2011-06-28 18:25:17 overwrite css/popup.css | ||
16 | 2011-06-28 18:26:21 overwrite css/popup.css | ||
17 | 2011-06-28 18:26:33 overwrite css/popup.css | ||
18 | 2011-06-28 18:26:42 overwrite css/popup.css | ||
19 | 2011-06-28 18:26:57 overwrite css/popup.css | ||
20 | 2011-06-28 18:29:57 overwrite css/popup.css | ||
21 | 2011-06-28 18:30:14 overwrite css/popup.css | ||
22 | 2011-06-28 18:30:23 overwrite css/popup.css | ||
23 | 2011-06-28 18:30:48 overwrite css/popup.css | ||
24 | 2011-06-28 18:31:03 overwrite css/popup.css | ||
25 | 2011-06-29 10:18:31 overwrite css/popup.css | ||
26 | 2011-06-29 10:18:47 overwrite css/popup.css | ||
27 | 2011-06-29 10:37:19 overwrite css/popup.css | ||
28 | 2011-06-29 10:40:29 overwrite css/popup.css | ||
29 | 2011-06-29 10:45:37 overwrite css/popup.css | ||
30 | 2011-06-29 10:45:53 identical css/popup.css | ||
31 | 2011-06-29 10:46:52 overwrite css/popup.css | ||
32 | 2011-06-29 10:47:02 identical css/popup.css | ||
33 | 2011-06-29 13:30:47 overwrite css/popup.css | ||
34 | 2011-06-29 13:31:14 overwrite css/popup.css | ||
35 | 2011-12-20 17:06:48 overwrite css/popup.css | ||
36 | 2011-12-22 11:29:15 overwrite css/popup.css | ||
37 | 2011-12-22 11:29:24 identical css/popup.css | ||
38 | 2011-12-22 11:30:05 overwrite css/popup.css | ||
39 | 2011-12-22 11:30:33 overwrite css/popup.css | ||
40 | 2011-12-22 11:30:51 overwrite css/popup.css | ||
41 | 2011-12-22 11:32:30 overwrite css/popup.css | ||
42 | 2011-12-22 11:33:06 overwrite css/popup.css | ||
43 | 2011-12-22 11:33:12 overwrite css/popup.css | ||
44 | 2011-12-22 11:33:32 identical css/popup.css | ||
45 | 2011-12-22 11:33:36 overwrite css/popup.css | ||
46 | 2011-12-22 11:34:48 overwrite css/popup.css | ||
47 | 2012-01-26 11:42:18 overwrite css/popup.css | ||
48 | 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 100644 --- 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/colorpanelpopup.reel/css/colorpanelpopup.css b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css index 6a418279..4db0abff 100644 --- 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 --- 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 | } |