Merge branch 'timeline-local' into timeline-multiselect

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

1 files changed, 8 insertions, 1 deletions

diff --git a/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css b/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css
index cb119a14..ddcc536e 100644
--- a/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css
+++ b/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css
@@ -9,11 +9,18 @@
 /* line 19, ../scss/PropertyTrack.scss */
 .content-main .collapsible-content .timeline-track {
   height: 20px;
+  padding-top: 2px;
   border-bottom: 1px solid #505050;
   background-image: url("../images/gridline.jpg");
 }
 
-/* line 26, ../scss/PropertyTrack.scss */
+/* line 27, ../scss/PropertyTrack.scss */
 .timeline-track .content-main {
   background-color: #474747;
 }
+
+/* line 31, ../scss/PropertyTrack.scss */
+.prop-track .collapsible-content.collapsible-collapsed {
+  overflow: hidden;
+  height: 0px;
+}