Merge branch 'timeline-local' into timeline-multiselect

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

1 files changed, 3 insertions, 0 deletions

diff --git a/js/panels/Timeline/Layer.reel/scss/Layer.scss b/js/panels/Timeline/Layer.reel/scss/Layer.scss
index 8e5e50db..a407c9dc 100644
--- a/js/panels/Timeline/Layer.reel/scss/Layer.scss
+++ b/js/panels/Timeline/Layer.reel/scss/Layer.scss
@@ -196,6 +196,9 @@
         top: 3px;
         right: 31px;
 }
+.timeline-track .collapsible-content {
+        position: relative;
+}
 .collapsible-content .layout-table {
         width: 99.9%;
 }