mirror of
https://github.com/videojs/video.js.git
synced 2025-07-13 01:30:17 +02:00
This commit is contained in:
committed by
Gary Katsevman
parent
c24a3a8173
commit
d0efd16b49
@ -18,6 +18,7 @@ CHANGELOG
|
|||||||
* @misteroneill updated modal dialog CSS ([view](https://github.com/videojs/video.js/pull/2756))
|
* @misteroneill updated modal dialog CSS ([view](https://github.com/videojs/video.js/pull/2756))
|
||||||
* @misteroneill Add browserify
|
* @misteroneill Add browserify
|
||||||
* @brkattk updated emulateTextTrack to exit early if no textTracks ([view](https://github.com/videojs/video.js/pull/2426))
|
* @brkattk updated emulateTextTrack to exit early if no textTracks ([view](https://github.com/videojs/video.js/pull/2426))
|
||||||
|
* @chemoish Fix captions sticking to bottom for webkit browsers. Fixes #2193 ([view](https://github.com/videojs/video.js/pull/2702))
|
||||||
|
|
||||||
--------------------
|
--------------------
|
||||||
|
|
||||||
|
@ -5,6 +5,14 @@
|
|||||||
background-color: rgba($color, $alpha);
|
background-color: rgba($color, $alpha);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@mixin transform($transform) {
|
||||||
|
-moz-transform: $transform;
|
||||||
|
-ms-transform: $transform;
|
||||||
|
-o-transform: $transform;
|
||||||
|
-webkit-transform: $transform;
|
||||||
|
transform: $transform;
|
||||||
|
}
|
||||||
|
|
||||||
@mixin transition($string: $transition--default) {
|
@mixin transition($string: $transition--default) {
|
||||||
-webkit-transition: $string;
|
-webkit-transition: $string;
|
||||||
-moz-transition: $string;
|
-moz-transition: $string;
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
/* Emulated tracks */
|
||||||
.vjs-text-track-display {
|
.vjs-text-track-display {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
bottom: 3em;
|
bottom: 3em;
|
||||||
@ -24,3 +25,13 @@
|
|||||||
.vjs-subtitles { color: #fff /* Subtitles are white */; }
|
.vjs-subtitles { color: #fff /* Subtitles are white */; }
|
||||||
.vjs-captions { color: #fc6 /* Captions are yellow */; }
|
.vjs-captions { color: #fc6 /* Captions are yellow */; }
|
||||||
.vjs-tt-cue { display: block; }
|
.vjs-tt-cue { display: block; }
|
||||||
|
|
||||||
|
/* Native tracks */
|
||||||
|
video::-webkit-media-text-track-display {
|
||||||
|
@include transform(translateY(-3em));
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Move captions down when controls aren't being shown */
|
||||||
|
.video-js.vjs-user-inactive.vjs-playing video::-webkit-media-text-track-display {
|
||||||
|
@include transform(translateY(-1.5em));
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user