diff --git a/static/css/application.css b/static/css/application.css index 0710b39b3e..e0748d16a6 100644 --- a/static/css/application.css +++ b/static/css/application.css @@ -2901,15 +2901,14 @@ section.course-content .dullify, section.course-content div.video-subtitles div. transition-delay: 0; } section.course-content .dullify:hover, section.course-content div.video-subtitles div.video-wrapper section.video-controls ul.vcr:hover, section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls:hover { opacity: 1; } -section.course-content div.video { +section.course-content div.video-subtitles { + zoom: 1; padding: 6px 22.652px; margin: 0 -22.652px; border-top: 1px solid #e1e1e1; border-bottom: 1px solid #e1e1e1; background: #f3f3f3; display: block; } -section.course-content div.video-subtitles { - zoom: 1; } section.course-content div.video-subtitles:before, section.course-content div.video-subtitles:after { content: ""; display: table; } @@ -3378,6 +3377,7 @@ section.course-content div.video-subtitles.closed ol.subtitles { section.course-content div.video-subtitles.fullscreen { background: rgba(0, 0, 0, 0.95); border: 0; + margin: 0; bottom: 0; height: 100%; left: 0; @@ -3408,7 +3408,9 @@ section.course-content div.video-subtitles.fullscreen a.exit::after { padding-left: 6px; } section.course-content div.video-subtitles.fullscreen a.exit:hover { color: #993333; } -section.course-content div.video-subtitles.fullscreen div.tc-wrapper object#myytplayer { +section.course-content div.video-subtitles.fullscreen div.tc-wrapper div.video-wrapper { + width: 100%; } +section.course-content div.video-subtitles.fullscreen div.tc-wrapper object#myytplayer, section.course-content div.video-subtitles.fullscreen div.tc-wrapper iframe { height: 100%; position: fixed; top: 0; diff --git a/templates/sass/courseware/_video.scss b/templates/sass/courseware/_video.scss index b8f09ff089..7aba7ad940 100644 --- a/templates/sass/courseware/_video.scss +++ b/templates/sass/courseware/_video.scss @@ -9,16 +9,16 @@ section.course-content { } div.video { + } + + div.video-subtitles { + @include clearfix(); padding: 6px lh(); margin: 0 (-(lh())); border-top: 1px solid #e1e1e1; border-bottom: 1px solid #e1e1e1; background: #f3f3f3; display: block; - } - - div.video-subtitles { - @include clearfix(); div.video-wrapper { float: left; @@ -395,6 +395,7 @@ section.course-content { &.fullscreen { background: rgba(#000, .95); border: 0; + margin: 0; bottom: 0; height: 100%; left: 0; @@ -427,7 +428,11 @@ section.course-content { } div.tc-wrapper { - object#myytplayer { + div.video-wrapper { + width: 100%; + } + + object#myytplayer, iframe { height: 100%; position: fixed; top: 0; diff --git a/templates/video.html b/templates/video.html index 76b0117f39..8498656fa6 100644 --- a/templates/video.html +++ b/templates/video.html @@ -2,7 +2,6 @@