From f92838b6ec33e2eb0f8eb06f3cbc7419f38143a1 Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Wed, 23 May 2012 11:43:43 -0700
Subject: Diamond keyframes

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 js/panels/Timeline/Keyframe.reel/Keyframe.js      | 2 +-
 js/panels/Timeline/Keyframe.reel/css/Keyframe.css | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'js/panels/Timeline/Keyframe.reel')

diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.js b/js/panels/Timeline/Keyframe.reel/Keyframe.js
index a4f957cf..52302319 100644
--- a/js/panels/Timeline/Keyframe.reel/Keyframe.js
+++ b/js/panels/Timeline/Keyframe.reel/Keyframe.js
@@ -42,7 +42,7 @@ var Keyframe = exports.Keyframe = Montage.create(Component, {
 
     draw:{
         value:function(){
-            this.element.style.left = (this.position - 3) + "px";
+            this.element.style.left = (this.position - 6) + "px";
         }
     },
 
diff --git a/js/panels/Timeline/Keyframe.reel/css/Keyframe.css b/js/panels/Timeline/Keyframe.reel/css/Keyframe.css
index ff5dae7a..36166c1c 100644
--- a/js/panels/Timeline/Keyframe.reel/css/Keyframe.css
+++ b/js/panels/Timeline/Keyframe.reel/css/Keyframe.css
@@ -6,11 +6,13 @@
 
 .tween_keyframe{
     position: absolute;
-    height: 16px;
-    width: 5px;
+    height: 10px;
+    width: 10px;
+    top: 3px;
     background-color: white;
     z-index: 23;
-    border-radius: 3px;
+    border-radius: 2px;
+    -webkit-transform: rotate(45deg);
 }
 
 .tween_keyframe.keyframeSelected{
-- 
cgit v1.2.3


From a8dff9f5cb9dec84e6805118d49903710b361275 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Wed, 23 May 2012 15:44:41 -0700
Subject: Timeline: Easing selection per keyframe.

---
 js/panels/Timeline/Keyframe.reel/Keyframe.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'js/panels/Timeline/Keyframe.reel')

diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.js b/js/panels/Timeline/Keyframe.reel/Keyframe.js
index 52302319..41eb6ef1 100644
--- a/js/panels/Timeline/Keyframe.reel/Keyframe.js
+++ b/js/panels/Timeline/Keyframe.reel/Keyframe.js
@@ -91,6 +91,7 @@ var Keyframe = exports.Keyframe = Montage.create(Component, {
             	}
             }
             this.parentComponent.parentComponent.parentComponent.draggingIndex = myIndex;
+            this.selectKeyframe();
 		}
 	},
 	handleDragend: {
-- 
cgit v1.2.3


From 41754c04c5c5f3c372dc2b38a122144f8d9e1d18 Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Wed, 30 May 2012 09:29:49 -0700
Subject: fancy keyframe selection

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 js/panels/Timeline/Keyframe.reel/Keyframe.js      | 4 +++-
 js/panels/Timeline/Keyframe.reel/css/Keyframe.css | 9 ++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'js/panels/Timeline/Keyframe.reel')

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, {
 
     draw:{
         value:function(){
-            this.element.style.left = (this.position - 6) + "px";
+            this.element.style.left = (this.position - 5) + "px";
         }
     },
 
     deselectKeyframe:{
         value:function(){
             this.element.classList.remove("keyframeSelected");
+            this.element.style.left = (this.position - 5) + "px";
         }
     },
 
     selectKeyframe:{
         value:function(){
             this.element.classList.add("keyframeSelected");
+            this.element.style.left = (this.position - 6) + "px";
             this.parentComponent.selectTween();
         }
     },
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 @@
 
 .tween_keyframe{
     position: absolute;
-    height: 10px;
-    width: 10px;
-    top: 3px;
+    height: 8px;
+    width: 8px;
+    top: 4px;
     background-color: white;
     z-index: 23;
     border-radius: 2px;
@@ -16,6 +16,9 @@
 }
 
 .tween_keyframe.keyframeSelected{
+    height: 10px;
+    width: 10px;
+    top: 3px;
     background-color: #570e19;
     border-style: solid;
     border-width: thin;
-- 
cgit v1.2.3