diff options
| author | Eric Guzman | 2012-02-13 15:48:37 -0800 |
|---|---|---|
| committer | Eric Guzman | 2012-02-13 15:48:37 -0800 |
| commit | b2672478decd3ee3bfacf86b525551c997f9604d (patch) | |
| tree | 79a88684406d3adf00350246a4da884b97fb0eac /js/panels/Timeline/Span.reel/css/Span.css | |
| parent | a738121a921e4c721b280434952b415b9ab3b1a8 (diff) | |
| parent | 0620e2f788861e824d6e49fa319da4d20b18a556 (diff) | |
| download | ninja-b2672478decd3ee3bfacf86b525551c997f9604d.tar.gz | |
Merge branch 'refs/heads/master' into StylesControllerUpdates
Conflicts:
js/controllers/styles-controller.js
Diffstat (limited to 'js/panels/Timeline/Span.reel/css/Span.css')
| -rw-r--r-- | js/panels/Timeline/Span.reel/css/Span.css | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/js/panels/Timeline/Span.reel/css/Span.css b/js/panels/Timeline/Span.reel/css/Span.css new file mode 100644 index 00000000..f239454d --- /dev/null +++ b/js/panels/Timeline/Span.reel/css/Span.css | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | .tween_span{ | ||
| 2 | position: absolute; | ||
| 3 | height: 16px; | ||
| 4 | opacity: 0.15; | ||
| 5 | background-color: white; | ||
| 6 | } | ||
| 7 | |||
| 8 | .tween_span.spanHighlight{ | ||
| 9 | background-color: #a0c8ff; | ||
| 10 | opacity: 0.4; | ||
| 11 | } \ No newline at end of file | ||