Merge branch 'refs/heads/NinjaInternal' into FileIO

Conflicts:
	js/controllers/document-controller.js

1 files changed, 13 insertions, 0 deletions

diff --git a/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css b/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css
new file mode 100644
index 00000000..9c27e705
--- /dev/null
+++ b/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css
@@ -0,0 +1,13 @@
+/* PropertyTrack.scss
+ * Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css.
+ */
+/* line 13, ../scss/PropertyTrack.scss */
+.content-main .collapsible-content .timeline-track {
+  height: 20px;
+  border-bottom: 1px solid #505050;
+}
+
+/* line 19, ../scss/PropertyTrack.scss */
+.timeline-track .content-main {
+  background-color: #474747;
+}