diff options
author | Ananya Sen | 2012-06-21 11:07:11 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-21 11:07:11 -0700 |
commit | 6915d6607f2d768f363baed84287f6593925ae1e (patch) | |
tree | 306738165c11fab764a27c3e76d93c2e4d86f297 /js/panels/Timeline/PropertyTrack.reel/scss | |
parent | 8db9e73ca68c006769af3997034959f6b7008add (diff) | |
parent | c8fc6d15e1570e89243abe527cd149e354f7e11f (diff) | |
download | ninja-6915d6607f2d768f363baed84287f6593925ae1e.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/panels/Timeline/PropertyTrack.reel/scss')
-rw-r--r-- | js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss index c7ae6f0c..a560ff3c 100644 --- a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss +++ b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss | |||
@@ -17,7 +17,8 @@ | |||
17 | 17 | ||
18 | 18 | ||
19 | .content-main .collapsible-content .timeline-track { | 19 | .content-main .collapsible-content .timeline-track { |
20 | height: 20px; | 20 | height: 18px; |
21 | padding-top: 2px; | ||
21 | border-bottom: 1px solid $color-menu-divider; | 22 | border-bottom: 1px solid $color-menu-divider; |
22 | background-image: url("../images/gridline.jpg"); | 23 | background-image: url("../images/gridline.jpg"); |
23 | } | 24 | } |
@@ -26,3 +27,8 @@ | |||
26 | .timeline-track .content-main { | 27 | .timeline-track .content-main { |
27 | background-color: $color-menu-bg; | 28 | background-color: $color-menu-bg; |
28 | } | 29 | } |
30 | |||
31 | .prop-track .collapsible-content.collapsible-collapsed { | ||
32 | overflow: hidden; | ||
33 | height: 0px; | ||
34 | } \ No newline at end of file | ||