Merge branch 'timeline-local' into timeline-multiselect

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	resolved using theirs. (selectLayers)

1 files changed, 6 insertions, 0 deletions

diff --git a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
index c7ae6f0c..31aed851 100644
--- a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
+++ b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
@@ -18,6 +18,7 @@
 
 .content-main .collapsible-content .timeline-track {
         height: 20px;
+    padding-top: 2px;
         border-bottom: 1px solid $color-menu-divider;
     background-image: url("../images/gridline.jpg");
  }
@@ -26,3 +27,8 @@
 .timeline-track .content-main {
         background-color: $color-menu-bg;
 }
+
+.prop-track .collapsible-content.collapsible-collapsed {
+        overflow: hidden;
+        height: 0px;
+}
\ No newline at end of file