aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/scss
diff options
context:
space:
mode:
authorEric Guzman2012-07-20 11:24:19 -0700
committerEric Guzman2012-07-20 11:24:19 -0700
commit3cc29231852440508bdeec1964e40ce59f979f99 (patch)
tree2faaf3d49337437e4a84818fe24dc64a60f8c611 /js/panels/Timeline/TimelinePanel.reel/scss
parent8fdf2fc8aefee68aec4c7b5891e0375f704cbf26 (diff)
parent9053e2037821a5c8405fabb74db9635deacfe8d5 (diff)
downloadninja-3cc29231852440508bdeec1964e40ce59f979f99.tar.gz
Merge branch 'refs/heads/master' into fixes_7.1
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/scss')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss53
1 files changed, 44 insertions, 9 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
index aa35fa8e..cf6df347 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.
148 padding-right: 5px; 148 padding-right: 5px;
149} 149}
150.playbutton{ 150.playbutton{
151 background-image: url('../images/play.png'); 151 background: transparent url("../images/play.png") no-repeat;
152 background-repeat: no-repeat;
153 height: 18px; 152 height: 18px;
154 width: 18px; 153 width: 18px;
155 float: left; 154 float: left;
156 padding-right: 5px; 155 padding-right: 5px;
156
157 border: none;
158 margin: 0;
159 min-width: 0;
160 opacity: 0.8;
161}
162.playbutton:hover {
163 background-color: #474747;
164 opacity: 1;
165}
166.playbutton.active:hover {
167 background-color: #474747;
168 opacity: 1;
169}
170.playbutton:focus {
171 -webkit-box-shadow: none;
157} 172}
158.pausebutton{ 173.pausebutton{
159 background-image: url('../images/pause.png'); 174 background-image: url("../images/pause.png");
160 background-repeat: no-repeat;
161 height: 18px;
162 width: 18px;
163 float: left;
164 padding-right: 5px;
165} 175}
166.forwardbutton{ 176.forwardbutton{
167 background-image: url('../images/play_next.png'); 177 background-image: url('../images/play_next.png');
@@ -336,7 +346,6 @@ POSSIBILITY OF SUCH DAMAGE.
336 background: none; 346 background: none;
337 float:left; 347 float:left;
338 margin-left: 5%; 348 margin-left: 5%;
339 visibility: hidden;
340} 349}
341 350
342/* Configuration menu */ 351/* Configuration menu */
@@ -398,3 +407,29 @@ POSSIBILITY OF SUCH DAMAGE.
398.layer-hidden { 407.layer-hidden {
399 display: none; 408 display: none;
400} 409}
410
411.tl_slider {
412 width: 127px;
413 height:5px;
414 float: left;
415 clear: none;
416 margin: 2px 0px 0px 0px;
417}
418
419.tl_slider .slider-track {
420 background: #292929;
421 width: 127px;
422 height: 4px;
423 border: 1px solid #000;
424 top: 3px;
425}
426
427.sliderClass {
428 float: left;
429 width: 127px
430}
431
432.sliderClass .knob {
433 background: url(../images/knob.png) no-repeat transparent center center;
434 margin-bottom: 2px;
435}