aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel
diff options
context:
space:
mode:
authorJonathan Duran2012-05-24 09:35:17 -0700
committerJonathan Duran2012-05-24 09:35:17 -0700
commit9809c96d96c24a512f6da1efbf44f174ca9321fe (patch)
treefa87aeee120500e57d1077c6c0c01a6cc717e144 /js/panels/Timeline/TimelineTrack.reel
parent458714f5bf2ab095f6e96dfec3f9ff7042527c04 (diff)
parenta8dff9f5cb9dec84e6805118d49903710b361275 (diff)
downloadninja-9809c96d96c24a512f6da1efbf44f174ca9321fe.tar.gz
Merge branch 'refs/heads/timeline-local' into TimelineUber
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js3
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css2
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss2
3 files changed, 4 insertions, 3 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 47e04d71..a5722335 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -1015,9 +1015,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
1015 this._dragAndDropHelper = event.target.cloneNode(true); 1015 this._dragAndDropHelper = event.target.cloneNode(true);
1016 this._dragAndDropHelper.style.opacity = 0.8; 1016 this._dragAndDropHelper.style.opacity = 0.8;
1017 this._dragAndDropHelper.style.position = "absolute"; 1017 this._dragAndDropHelper.style.position = "absolute";
1018 this._dragAndDropHelper.style.top = "2px"; 1018 this._dragAndDropHelper.style.top = "5px";
1019 this._dragAndDropHelper.style.left = "0px"; 1019 this._dragAndDropHelper.style.left = "0px";
1020 this._dragAndDropHelper.style.zIndex = 700; 1020 this._dragAndDropHelper.style.zIndex = 700;
1021 this._dragAndDropHelper.classList.add("keyframeSelected");
1021 1022
1022 //this._dragAndDropHelper.style.width = window.getComputedStyle(this.container_layers, null).getPropertyValue("width"); 1023 //this._dragAndDropHelper.style.width = window.getComputedStyle(this.container_layers, null).getPropertyValue("width");
1023 this._dragAndDropHelper.classList.add("track-dnd-helper"); 1024 this._dragAndDropHelper.classList.add("track-dnd-helper");
diff --git a/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css b/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css
index 03d1cf8d..9ea5ce01 100644
--- a/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css
+++ b/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css
@@ -17,7 +17,7 @@
17 border-bottom-style: solid; 17 border-bottom-style: solid;
18 border-bottom-width: thin; 18 border-bottom-width: thin;
19 background-image: url("../images/gridline.jpg"); 19 background-image: url("../images/gridline.jpg");
20 overflow: hidden; 20 overflow: visible;
21} 21}
22 22
23/* line 34, ../scss/TimelineTrack.scss */ 23/* line 34, ../scss/TimelineTrack.scss */
diff --git a/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
index 1b025c74..bad754a6 100644
--- a/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
+++ b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
@@ -28,7 +28,7 @@
28 border-bottom-style: solid; 28 border-bottom-style: solid;
29 border-bottom-width: thin; 29 border-bottom-width: thin;
30 background-image: url("../images/gridline.jpg"); 30 background-image: url("../images/gridline.jpg");
31 overflow: hidden; 31 overflow: visible;
32} 32}
33 33
34.keyframe{ 34.keyframe{