diff options
| author | Kruti Shah | 2012-05-31 10:44:45 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-05-31 10:44:45 -0700 |
| commit | c350cc1c060fdf17357ddadce024267943784593 (patch) | |
| tree | 453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss | |
| parent | fdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff) | |
| parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
| download | ninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz | |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss')
| -rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss index 1b025c74..bad754a6 100644 --- a/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss +++ b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | border-bottom-style: solid; | 28 | border-bottom-style: solid; |
| 29 | border-bottom-width: thin; | 29 | border-bottom-width: thin; |
| 30 | background-image: url("../images/gridline.jpg"); | 30 | background-image: url("../images/gridline.jpg"); |
| 31 | overflow: hidden; | 31 | overflow: visible; |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | .keyframe{ | 34 | .keyframe{ |