Merge branch 'refs/heads/master' into menu-fixes

1 files changed, 26 insertions, 1 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
index aa35fa8e..d2d813bb 100644
--- a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
+++ b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
@@ -336,7 +336,6 @@ POSSIBILITY OF SUCH DAMAGE.
     background: none;
     float:left;
     margin-left: 5%;
-    visibility: hidden;
 }
 
 /* Configuration menu */
@@ -398,3 +397,29 @@ POSSIBILITY OF SUCH DAMAGE.
 .layer-hidden {
     display: none;
 }
+
+.tl_slider {
+    width: 127px;
+    height:5px;
+    float: left;
+    clear: none;
+    margin: 2px 0px 0px 0px;
+}
+
+.tl_slider .slider-track {
+    background: #292929;
+    width: 127px;
+    height: 4px;
+    border: 1px solid #000;
+    top: 3px;
+}
+
+.sliderClass {
+    float: left;
+    width: 127px
+}
+
+.sliderClass .knob {
+    background: url(../images/knob.png) no-repeat transparent center center;
+    margin-bottom: 2px;
+}