Skip to content

Commit

Permalink
Rework css for time display.
Browse files Browse the repository at this point in the history
No z-index for time display when vjs-no-flex is set. This is so that on devices like IE8, the time display will always show up behind the play progress and current time display.
  • Loading branch information
gkatsev committed Sep 14, 2015
1 parent fb845fb commit ffc0ac5
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
9 changes: 7 additions & 2 deletions src/css/components/_progress.scss
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
font-size: 0.9em;
height: 1em;
line-height: 1em;
z-index: 1;
}
}

Expand All @@ -91,6 +90,9 @@
padding: 0.2em 0.5em;
@include background-color-with-alpha($primary-text, 0.8);
@include border-radius(0.3em);
}
.video-js .vjs-play-progress:before,
.video-js .vjs-play-progress:after {
z-index: 1;
}

Expand All @@ -115,7 +117,10 @@ specific time ranges that have been buffered */
width: 1px;
height: 100%;
background-color: $primary-bg;
opacity: 0.9;
z-index: 1;
}
.vjs-no-flex .vjs-progress-control .vjs-mouse-display {
z-index: 0;
}
.video-js .vjs-progress-control:hover .vjs-mouse-display {
display: block;
Expand Down
4 changes: 2 additions & 2 deletions src/js/control-bar/progress-control/seek-bar.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ class SeekBar extends Slider {
SeekBar.prototype.options_ = {
children: {
'loadProgressBar': {},
'playProgressBar': {},
'mouseTimeDisplay': {}
'mouseTimeDisplay': {},
'playProgressBar': {}
},
'barName': 'playProgressBar'
};
Expand Down

0 comments on commit ffc0ac5

Please sign in to comment.