Merge branch 'Timeline-latest-change' of github.com:ntfx47/ninja-internal into TimelineUber

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
index b9d45979..7dddaba7 100644
--- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
+++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
@@ -272,6 +272,7 @@
     font-size: 12px;
     text-shadow: 1px 1px 1px black;
     color: white;
+    margin-top: 0%;
 }
 .timeline-disabled {
         position: absolute;
@@ -287,3 +288,10 @@
 .timeline-dnd-helper {
         -webkit-transform: scale(.9, .9);
 }
+.tl_slider{
+    width: 65px;
+    height: 5px;
+    background: none;
+    float:left;
+    margin-left: 5%;
+}