aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Keyframe.reel
diff options
context:
space:
mode:
authorJon Reid2012-05-30 09:35:56 -0700
committerJon Reid2012-05-30 09:35:56 -0700
commit9253e2ce98d748edd8c3929f113a597923960387 (patch)
tree061c47f4df587ef0dde2a63f7395299c5c91747c /js/panels/Timeline/Keyframe.reel
parentd901a7539cdde3e02c8dc98b3c35e2c58b6f1abe (diff)
parent41754c04c5c5f3c372dc2b38a122144f8d9e1d18 (diff)
downloadninja-9253e2ce98d748edd8c3929f113a597923960387.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/panels/Timeline/Keyframe.reel')
-rw-r--r--js/panels/Timeline/Keyframe.reel/Keyframe.js4
-rw-r--r--js/panels/Timeline/Keyframe.reel/css/Keyframe.css9
2 files changed, 9 insertions, 4 deletions
diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.js b/js/panels/Timeline/Keyframe.reel/Keyframe.js
index 41eb6ef1..b91027b6 100644
--- a/js/panels/Timeline/Keyframe.reel/Keyframe.js
+++ b/js/panels/Timeline/Keyframe.reel/Keyframe.js
@@ -42,19 +42,21 @@ var Keyframe = exports.Keyframe = Montage.create(Component, {
42 42
43 draw:{ 43 draw:{
44 value:function(){ 44 value:function(){
45 this.element.style.left = (this.position - 6) + "px"; 45 this.element.style.left = (this.position - 5) + "px";
46 } 46 }
47 }, 47 },
48 48
49 deselectKeyframe:{ 49 deselectKeyframe:{
50 value:function(){ 50 value:function(){
51 this.element.classList.remove("keyframeSelected"); 51 this.element.classList.remove("keyframeSelected");
52 this.element.style.left = (this.position - 5) + "px";
52 } 53 }
53 }, 54 },
54 55
55 selectKeyframe:{ 56 selectKeyframe:{
56 value:function(){ 57 value:function(){
57 this.element.classList.add("keyframeSelected"); 58 this.element.classList.add("keyframeSelected");
59 this.element.style.left = (this.position - 6) + "px";
58 this.parentComponent.selectTween(); 60 this.parentComponent.selectTween();
59 } 61 }
60 }, 62 },
diff --git a/js/panels/Timeline/Keyframe.reel/css/Keyframe.css b/js/panels/Timeline/Keyframe.reel/css/Keyframe.css
index 36166c1c..5ea236e9 100644
--- a/js/panels/Timeline/Keyframe.reel/css/Keyframe.css
+++ b/js/panels/Timeline/Keyframe.reel/css/Keyframe.css
@@ -6,9 +6,9 @@
6 6
7.tween_keyframe{ 7.tween_keyframe{
8 position: absolute; 8 position: absolute;
9 height: 10px; 9 height: 8px;
10 width: 10px; 10 width: 8px;
11 top: 3px; 11 top: 4px;
12 background-color: white; 12 background-color: white;
13 z-index: 23; 13 z-index: 23;
14 border-radius: 2px; 14 border-radius: 2px;
@@ -16,6 +16,9 @@
16} 16}
17 17
18.tween_keyframe.keyframeSelected{ 18.tween_keyframe.keyframeSelected{
19 height: 10px;
20 width: 10px;
21 top: 3px;
19 background-color: #570e19; 22 background-color: #570e19;
20 border-style: solid; 23 border-style: solid;
21 border-width: thin; 24 border-width: thin;