Commit 4a53f781 by clrux Committed by GitHub

Merge pull request #12676 from edx/clrux/ac-473

AC-473 fixing width of closed captions in fullscreen
parents 1ff0a3b4 c1942467
...@@ -744,6 +744,13 @@ ...@@ -744,6 +744,13 @@
} }
} }
} }
&.video-fullscreen {
.closed-captions {
width: 60%;
}
}
.subtitles { .subtitles {
@include float(left); @include float(left);
......
...@@ -133,7 +133,8 @@ define('video/04_video_full_screen.js', [], function () { ...@@ -133,7 +133,8 @@ define('video/04_video_full_screen.js', [], function () {
} }
function exit() { function exit() {
var fullScreenClassNameEl = this.el.add(document.documentElement); var fullScreenClassNameEl = this.el.add(document.documentElement),
closedCaptionsEl = this.el.find('.closed-captions');
this.videoFullScreen.fullScreenState = this.isFullScreen = false; this.videoFullScreen.fullScreenState = this.isFullScreen = false;
fullScreenClassNameEl.removeClass('video-fullscreen'); fullScreenClassNameEl.removeClass('video-fullscreen');
...@@ -146,10 +147,16 @@ define('video/04_video_full_screen.js', [], function () { ...@@ -146,10 +147,16 @@ define('video/04_video_full_screen.js', [], function () {
.text(gettext('Fill browser')); .text(gettext('Fill browser'));
this.el.trigger('fullscreen', [this.isFullScreen]); this.el.trigger('fullscreen', [this.isFullScreen]);
$(closedCaptionsEl).css({
'top': '70%',
'left': '5%'
});
} }
function enter() { function enter() {
var fullScreenClassNameEl = this.el.add(document.documentElement); var fullScreenClassNameEl = this.el.add(document.documentElement),
closedCaptionsEl = this.el.find('.closed-captions');
this.scrollPos = $(window).scrollTop(); this.scrollPos = $(window).scrollTop();
$(window).scrollTop(0); $(window).scrollTop(0);
...@@ -163,6 +170,11 @@ define('video/04_video_full_screen.js', [], function () { ...@@ -163,6 +170,11 @@ define('video/04_video_full_screen.js', [], function () {
.text(gettext('Exit full browser')); .text(gettext('Exit full browser'));
this.el.trigger('fullscreen', [this.isFullScreen]); this.el.trigger('fullscreen', [this.isFullScreen]);
$(closedCaptionsEl).css({
'top': '70%',
'left': '5%'
});
} }
/** Toggle fullscreen mode. */ /** Toggle fullscreen mode. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment