Merge branch 'refs/heads/master' into StylesControllerUpdates

Conflicts:
	js/controllers/styles-controller.js

1 files changed, 15 insertions, 0 deletions

diff --git a/js/panels/Timeline/Keyframe.reel/css/Keyframe.css b/js/panels/Timeline/Keyframe.reel/css/Keyframe.css
new file mode 100644
index 00000000..4afc1180
--- /dev/null
+++ b/js/panels/Timeline/Keyframe.reel/css/Keyframe.css
@@ -0,0 +1,15 @@
+.tween_keyframe{
+    position: absolute;
+    height: 16px;
+    width: 5px;
+    background-color: white;
+    z-index: 23;
+    border-radius: 3px;
+}
+
+.tween_keyframe.keyframeSelected{
+    background-color: #570e19;
+    border-style: solid;
+    border-width: thin;
+    border-color: #d6d1cf;
+}
\ No newline at end of file