diff options
| author | Armen Kesablyan | 2012-06-21 14:36:32 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-21 14:36:32 -0700 |
| commit | d9f9a65226dfe26500e82061cc38a7dda302f720 (patch) | |
| tree | 32ae4d83164e71f83bf60eaaf0969d80a4d1e8b4 /js/panels/Timeline/TimelineTrack.reel/scss | |
| parent | 1830a7cf4150087ee12711ea75f1162e6e3c2934 (diff) | |
| parent | 9fe9bc495af74d963fa7061d4d1a479720133a56 (diff) | |
| download | ninja-d9f9a65226dfe26500e82061cc38a7dda302f720.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/hintable.reel/hintable.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/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{ |