diff options
author | Jonathan Duran | 2012-02-08 10:36:45 -0800 |
---|---|---|
committer | Jonathan Duran | 2012-02-08 10:36:45 -0800 |
commit | 479cd367696ae5bf02c774e2be75234aad05bce7 (patch) | |
tree | cbb431b9fe69172d4242e7720bdc3249684a35af /js/panels | |
parent | f15310815073203d72de97aa20dbfaa5707ca726 (diff) | |
download | ninja-479cd367696ae5bf02c774e2be75234aad05bce7.tar.gz |
Keyframe and span style updates and change time marker times
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels')
-rw-r--r-- | js/panels/Timeline/Span.reel/css/Span.css | 3 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/js/panels/Timeline/Span.reel/css/Span.css b/js/panels/Timeline/Span.reel/css/Span.css index 1e988c6c..f239454d 100644 --- a/js/panels/Timeline/Span.reel/css/Span.css +++ b/js/panels/Timeline/Span.reel/css/Span.css | |||
@@ -1,10 +1,11 @@ | |||
1 | .tween_span{ | 1 | .tween_span{ |
2 | position: absolute; | 2 | position: absolute; |
3 | height: 16px; | 3 | height: 16px; |
4 | opacity: 0.3; | 4 | opacity: 0.15; |
5 | background-color: white; | 5 | background-color: white; |
6 | } | 6 | } |
7 | 7 | ||
8 | .tween_span.spanHighlight{ | 8 | .tween_span.spanHighlight{ |
9 | background-color: #a0c8ff; | 9 | background-color: #a0c8ff; |
10 | opacity: 0.4; | ||
10 | } \ No newline at end of file | 11 | } \ No newline at end of file |
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 860868e5..c93e66d0 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -53,7 +53,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
53 | }, | 53 | }, |
54 | 54 | ||
55 | millisecondsOffset:{ | 55 | millisecondsOffset:{ |
56 | value:5000 | 56 | value:1000 |
57 | }, | 57 | }, |
58 | 58 | ||
59 | // Track model | 59 | // Track model |