Merge branch 'master' of github.com:Motorola-Mobility/ninja

1 files changed, 45 insertions, 10 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
index aa35fa8e..cce01c90 100644
--- a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
+++ b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
@@ -148,20 +148,30 @@ POSSIBILITY OF SUCH DAMAGE.
     padding-right: 5px;
 }
 .playbutton{
-    background-image: url('../images/play.png');
-    background-repeat: no-repeat;
+    background: transparent url("../images/play.png") no-repeat;
     height: 18px;
     width: 18px;
     float: left;
     padding-right: 5px;
+
+    border: none;
+    margin: 0;
+    min-width: 0;
+    opacity: 0.8;
+}
+.playbutton:hover {
+    background-color: #474747;
+    opacity: 1;
+}
+.playbutton.active:hover {
+    background-color: #474747;
+    opacity: 1;
+}
+.playbutton:focus {
+    -webkit-box-shadow: none;
 }
 .pausebutton{
-    background-image: url('../images/pause.png');
-    background-repeat: no-repeat;
-    height: 18px;
-    width: 18px;
-    float: left;
-    padding-right: 5px;
+    background-image: url("../images/pause.png");
 }
 .forwardbutton{
     background-image: url('../images/play_next.png');
@@ -295,7 +305,7 @@ POSSIBILITY OF SUCH DAMAGE.
     top: 0;
     left: 0;
     position: absolute;
-    z-index: 91;
+    z-index: 1;
     opacity: 0.7;
 }
 .timebar{
@@ -336,7 +346,6 @@ POSSIBILITY OF SUCH DAMAGE.
     background: none;
     float:left;
     margin-left: 5%;
-    visibility: hidden;
 }
 
 /* Configuration menu */
@@ -398,3 +407,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;
+}