diff options
| author | Eric Guzman | 2012-02-29 16:13:19 -0800 |
|---|---|---|
| committer | Eric Guzman | 2012-02-29 16:13:19 -0800 |
| commit | 53bdb1e7773069c4cca59e88d6da91cd0f58c94a (patch) | |
| tree | 44a2147fcbb43ea483f78a1e2e082919f9c81970 /js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss | |
| parent | b2c60efb9c6f5dfa7b0fc5c2b9feebebc805ed97 (diff) | |
| parent | b09956e4a9a35c5588cc7cd1f01efb617cbe0884 (diff) | |
| download | ninja-53bdb1e7773069c4cca59e88d6da91cd0f58c94a.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
Diffstat (limited to 'js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss')
| -rw-r--r-- | js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss index 273e3d77..c7ae6f0c 100644 --- a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss +++ b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | .content-main .collapsible-content .timeline-track { | 19 | .content-main .collapsible-content .timeline-track { |
| 20 | height: 20px; | 20 | height: 20px; |
| 21 | border-bottom: 1px solid $color-menu-divider; | 21 | border-bottom: 1px solid $color-menu-divider; |
| 22 | background-image: url("../images/gridline.jpg"); | ||
| 22 | } | 23 | } |
| 23 | 24 | ||
| 24 | 25 | ||