diff options
| author | Jon Reid | 2012-02-08 10:29:00 -0800 |
|---|---|---|
| committer | Jon Reid | 2012-02-08 10:29:00 -0800 |
| commit | 687ef6c8c8aad9728f106b1802cf0bfc5ce745f0 (patch) | |
| tree | db790c730001b9339f2a7083b522d33587de8efc /js/panels/Timeline/Span.reel/css | |
| parent | 6ce7a6c94b2ea24a3a3a2aba7230864e924e952b (diff) | |
| parent | 91df2e8030db394060667202a97138db3f871fa5 (diff) | |
| download | ninja-687ef6c8c8aad9728f106b1802cf0bfc5ce745f0.tar.gz | |
Merge branch 'Timeline-jduran' into Timeline-jreid
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Diffstat (limited to 'js/panels/Timeline/Span.reel/css')
| -rw-r--r-- | js/panels/Timeline/Span.reel/css/Span.css | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/js/panels/Timeline/Span.reel/css/Span.css b/js/panels/Timeline/Span.reel/css/Span.css index 1583c20f..1e988c6c 100644 --- a/js/panels/Timeline/Span.reel/css/Span.css +++ b/js/panels/Timeline/Span.reel/css/Span.css | |||
| @@ -3,4 +3,8 @@ | |||
| 3 | height: 16px; | 3 | height: 16px; |
| 4 | opacity: 0.3; | 4 | opacity: 0.3; |
| 5 | background-color: white; | 5 | background-color: white; |
| 6 | } | ||
| 7 | |||
| 8 | .tween_span.spanHighlight{ | ||
| 9 | background-color: #a0c8ff; | ||
| 6 | } \ No newline at end of file | 10 | } \ No newline at end of file |