Commit 4d02f5d6 by Kyle Fiedler

Added fixes for bugs for the video

parent a7787d23
...@@ -510,8 +510,8 @@ html body div.qtip div.ui-tooltip-content { ...@@ -510,8 +510,8 @@ html body div.qtip div.ui-tooltip-content {
border: none; border: none;
background: rgba(0, 0, 0, 0.8); background: rgba(0, 0, 0, 0.8);
color: #fff; color: #fff;
font: 12px 14px; font: 12px "Open Sans", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
margin-top: 5px; } margin-top: -30px; }
html body section.outside-app { html body section.outside-app {
max-width: 600px; max-width: 600px;
padding: 22.652px; } padding: 22.652px; }
...@@ -2909,16 +2909,12 @@ section.course-content div.video { ...@@ -2909,16 +2909,12 @@ section.course-content div.video {
background: #f3f3f3; background: #f3f3f3;
display: block; } display: block; }
section.course-content div.video-subtitles { section.course-content div.video-subtitles {
display: table;
zoom: 1; } zoom: 1; }
section.course-content div.video-subtitles:before, section.course-content div.video-subtitles:after { section.course-content div.video-subtitles:before, section.course-content div.video-subtitles:after {
content: ""; content: "";
display: table; } display: table; }
section.course-content div.video-subtitles:after { section.course-content div.video-subtitles:after {
clear: both; } clear: both; }
section.course-content div.video-subtitles div.tc-wrapper {
display: table-cell;
width: 100%; }
section.course-content div.video-subtitles div.video-wrapper { section.course-content div.video-subtitles div.video-wrapper {
float: left; float: left;
width: 65.761%; width: 65.761%;
...@@ -3169,6 +3165,8 @@ section.course-content div.video-subtitles div.video-wrapper section.video-contr ...@@ -3169,6 +3165,8 @@ section.course-content div.video-subtitles div.video-wrapper section.video-contr
clear: both; } clear: both; }
section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds a.open { section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds a.open {
background: url("/static/images/open-arrow.png") 10px center no-repeat; } background: url("/static/images/open-arrow.png") 10px center no-repeat; }
section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds a.open ol#video_speeds {
opacity: 1; }
section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds a h3, section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds a div#wiki_panel input[type="button"], div#wiki_panel section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds a input[type="button"] { section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds a h3, section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds a div#wiki_panel input[type="button"], div#wiki_panel section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds a input[type="button"] {
color: #999; color: #999;
font-size: 12px; font-size: 12px;
...@@ -3185,22 +3183,36 @@ section.course-content div.video-subtitles div.video-wrapper section.video-contr ...@@ -3185,22 +3183,36 @@ section.course-content div.video-subtitles div.video-wrapper section.video-contr
section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds a ol#video_speeds { section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds a ol#video_speeds {
background-color: #444; background-color: #444;
border: 1px solid #000; border: 1px solid #000;
border-top: 0; border-bottom: 0;
-webkit-box-shadow: inset 1px 0 0 #555555; -webkit-box-shadow: inset 1px 0 0 #555555, 0 2px 0 #444444;
-moz-box-shadow: inset 1px 0 0 #555555; -moz-box-shadow: inset 1px 0 0 #555555, 0 2px 0 #444444;
box-shadow: inset 1px 0 0 #555555; box-shadow: inset 1px 0 0 #555555, 0 2px 0 #444444;
display: -moz-inline-box;
-moz-box-orient: vertical;
display: inline-block;
vertical-align: baseline;
zoom: 1;
*display: inline;
*vertical-align: auto;
left: -1px; left: -1px;
position: absolute; position: absolute;
top: 46px; top: 0;
width: 100%; width: 100%;
z-index: 10; } z-index: 10;
-webkit-transition-property: all;
-moz-transition-property: all;
-ms-transition-property: all;
-o-transition-property: all;
transition-property: all;
-webkit-transition-duration: 0.15s;
-moz-transition-duration: 0.15s;
-ms-transition-duration: 0.15s;
-o-transition-duration: 0.15s;
transition-duration: 0.15s;
-webkit-transition-timing-function: ease-out;
-moz-transition-timing-function: ease-out;
-ms-transition-timing-function: ease-out;
-o-transition-timing-function: ease-out;
transition-timing-function: ease-out;
-webkit-transition-delay: 0;
-moz-transition-delay: 0;
-ms-transition-delay: 0;
-o-transition-delay: 0;
transition-delay: 0;
opacity: 0; }
section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds a ol#video_speeds li { section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds a ol#video_speeds li {
border-bottom: 1px solid #000; border-bottom: 1px solid #000;
-webkit-box-shadow: 0 1px 0 #555555; -webkit-box-shadow: 0 1px 0 #555555;
...@@ -3375,21 +3387,15 @@ section.course-content div.video-subtitles.fullscreen { ...@@ -3375,21 +3387,15 @@ section.course-content div.video-subtitles.fullscreen {
top: 0; top: 0;
width: 100%; width: 100%;
z-index: 999; } z-index: 999; }
section.course-content div.video-subtitles.fullscreen.closed div.video-wrapper {
width: 82.88%;
margin: 0 auto;
float: none; }
section.course-content div.video-subtitles.fullscreen.closed ol.subtitles {
width: 0px;
height: 0; }
section.course-content div.video-subtitles.fullscreen a.exit { section.course-content div.video-subtitles.fullscreen a.exit {
position: absolute; position: absolute;
top: 20px; top: 20px;
right: 20px; left: 20px;
color: #aaa; color: #aaa;
text-transform: uppercase; text-transform: uppercase;
letter-spacing: 1px; letter-spacing: 1px;
font-style: 12px; } font-style: 12px;
display: none; }
section.course-content div.video-subtitles.fullscreen a.exit::after { section.course-content div.video-subtitles.fullscreen a.exit::after {
content: "✖"; content: "✖";
display: -moz-inline-box; display: -moz-inline-box;
...@@ -3402,14 +3408,29 @@ section.course-content div.video-subtitles.fullscreen a.exit::after { ...@@ -3402,14 +3408,29 @@ section.course-content div.video-subtitles.fullscreen a.exit::after {
padding-left: 6px; } padding-left: 6px; }
section.course-content div.video-subtitles.fullscreen a.exit:hover { section.course-content div.video-subtitles.fullscreen a.exit:hover {
color: #993333; } color: #993333; }
section.course-content div.video-subtitles.fullscreen div.tc-wrapper {
padding: 20px;
vertical-align: middle;
max-height: 100%;
overflow-y: scroll; }
section.course-content div.video-subtitles.fullscreen div.tc-wrapper object#myytplayer { section.course-content div.video-subtitles.fullscreen div.tc-wrapper object#myytplayer {
max-height: 100%; height: 100%;
position: fixed;
top: 0;
bottom: 0;
left: 0;
overflow: hidden; } overflow: hidden; }
section.course-content div.video-subtitles.fullscreen div.tc-wrapper section.video-controls {
position: absolute;
bottom: 0;
left: 0;
width: 100%;
z-index: 9999; }
section.course-content div.video-subtitles.fullscreen ol.subtitles {
position: fixed;
top: 0;
right: 0;
bottom: 0;
height: 100%;
background: rgba(0, 0, 0, 0.8);
padding: 22.652px;
max-width: 23.482%;
max-height: 100%; }
section.course-content div.video-subtitles.fullscreen ol.subtitles li { section.course-content div.video-subtitles.fullscreen ol.subtitles li {
color: #aaa; } color: #aaa; }
section.course-content div.video-subtitles.fullscreen ol.subtitles li.current { section.course-content div.video-subtitles.fullscreen ol.subtitles li.current {
......
static/images/open-arrow.png

105 Bytes | W: | H:

static/images/open-arrow.png

2.76 KB | W: | H:

static/images/open-arrow.png
static/images/open-arrow.png
static/images/open-arrow.png
static/images/open-arrow.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// ---------------------------------------- // // ---------------------------------------- //
// fonts // fonts
$body-font-family: "Open Sans", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;; $body-font-family: "Open Sans", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
$body-font-size: 14px; $body-font-size: 14px;
// grid // grid
......
...@@ -18,14 +18,8 @@ section.course-content { ...@@ -18,14 +18,8 @@ section.course-content {
} }
div.video-subtitles { div.video-subtitles {
display: table;
@include clearfix(); @include clearfix();
div.tc-wrapper {
display: table-cell;
width: 100%;
}
div.video-wrapper { div.video-wrapper {
float: left; float: left;
width: flex-grid(6, 9); width: flex-grid(6, 9);
...@@ -212,6 +206,10 @@ section.course-content { ...@@ -212,6 +206,10 @@ section.course-content {
&.open { &.open {
background: url('/static/images/open-arrow.png') 10px center no-repeat; background: url('/static/images/open-arrow.png') 10px center no-repeat;
ol#video_speeds {
opacity: 1;
}
} }
h3 { h3 {
...@@ -235,14 +233,15 @@ section.course-content { ...@@ -235,14 +233,15 @@ section.course-content {
ol#video_speeds { ol#video_speeds {
background-color: #444; background-color: #444;
border: 1px solid #000; border: 1px solid #000;
border-top: 0; border-bottom: 0;
@include box-shadow(inset 1px 0 0 #555); @include box-shadow(inset 1px 0 0 #555, 0 2px 0 #444);
@include inline-block();
left: -1px; left: -1px;
position: absolute; position: absolute;
top: 46px; top:0;
width: 100%; width: 100%;
z-index: 10; z-index: 10;
@include transition();
opacity: 0;
li { li {
border-bottom: 1px solid #000; border-bottom: 1px solid #000;
...@@ -406,29 +405,15 @@ section.course-content { ...@@ -406,29 +405,15 @@ section.course-content {
width: 100%; width: 100%;
z-index: 999; z-index: 999;
&.closed {
@extend .trans;
div.video-wrapper {
width: flex-grid(7.5,9);
margin: 0 auto;
float: none;
}
ol.subtitles {
width: 0px;
height: 0;
}
}
a.exit { a.exit {
position: absolute; position: absolute;
top: 20px; top: 20px;
right: 20px; left: 20px;
color: #aaa; color: #aaa;
text-transform: uppercase; text-transform: uppercase;
letter-spacing: 1px; letter-spacing: 1px;
font-style: 12px; font-style: 12px;
display: none;
&::after { &::after {
content: "✖"; content: "✖";
...@@ -442,19 +427,35 @@ section.course-content { ...@@ -442,19 +427,35 @@ section.course-content {
} }
div.tc-wrapper { div.tc-wrapper {
padding: 20px;
vertical-align: middle;
max-height: 100%;
overflow-y: scroll;
object#myytplayer { object#myytplayer {
max-height: 100%; height: 100%;
position: fixed;
top: 0;
bottom: 0;
left: 0;
overflow: hidden; overflow: hidden;
} }
section.video-controls {
position: absolute;
bottom: 0;
left: 0;
width: 100%;
z-index: 9999;
}
} }
ol.subtitles { ol.subtitles {
position: fixed;
top: 0;
right: 0;
bottom: 0;
height: 100%;
background: rgba(#000, .8);
padding: lh();
max-width: flex-grid(3);
max-height: 100%;
li { li {
color: #aaa; color: #aaa;
......
...@@ -35,8 +35,8 @@ html { ...@@ -35,8 +35,8 @@ html {
border: none; border: none;
background: rgba(#000, .8); background: rgba(#000, .8);
color: #fff; color: #fff;
font: 12px $body-font-size; font: 12px $body-font-family;
margin-top: 5px; margin-top: -30px;
} }
} }
......
...@@ -72,10 +72,10 @@ ...@@ -72,10 +72,10 @@
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
$(function() { $(function() {
$('.add-fullscreen, .hide-subtitles').qtip({ $('.add-fullscreen, .hide-subtitles').qtip({
position: { position: {
my: 'top center', // Position my top left... my: 'top right',
at: 'bottom center', // at the bottom right at: 'top right'
} }
}); });
$('.add-fullscreen').click(function() { $('.add-fullscreen').click(function() {
...@@ -114,11 +114,13 @@ at: 'bottom center', // at the bottom right ...@@ -114,11 +114,13 @@ at: 'bottom center', // at the bottom right
return false; return false;
}); });
$("ol#video_speeds").hide(); var dropUpHeight = $('ol#video_speeds').height();
console.log(dropUpHeight);
// $('ol#video_speeds').css('top', -(dropUpHeight));
$("div.speeds a").hover(function() { $("div.speeds a").hover(function() {
$(this).toggleClass("open"); $(this).toggleClass("open");
$("ol#video_speeds").slideToggle(150);
}); });
$("div.speeds a").click(function() { $("div.speeds a").click(function() {
......
...@@ -88,6 +88,7 @@ function add_speed(key, stream) { ...@@ -88,6 +88,7 @@ function add_speed(key, stream) {
var active = $(this).text(); var active = $(this).text();
$("p.active").text(active); $("p.active").text(active);
}); });
} }
var l=[] var l=[]
...@@ -128,6 +129,9 @@ $(document).ready(function() { ...@@ -128,6 +129,9 @@ $(document).ready(function() {
add_speed(l[i], streams[l[i]]) add_speed(l[i], streams[l[i]])
} }
var dropUpHeight = $('ol#video_speeds').height();
console.log(dropUpHeight);
$('ol#video_speeds').css('top', -(dropUpHeight));
}); });
function toggleVideo(){ function toggleVideo(){
......
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