Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
edx-platform-release
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
code.vt.edu will be down for maintenance from 0530-0630 EDT Wednesday, March 26th
Show more breadcrumbs
Hsin-Yu Chien
edx-platform-release
Commits
8b563c0c
Commit
8b563c0c
authored
12 years ago
by
Kyle Fiedler
Browse files
Options
Downloads
Patches
Plain Diff
added some more styles for the fullscreen video
parent
2be9a1e6
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
static/css/application.css
+43
-18
43 additions, 18 deletions
static/css/application.css
templates/sass/courseware/_video.scss
+51
-18
51 additions, 18 deletions
templates/sass/courseware/_video.scss
templates/video.html
+19
-1
19 additions, 1 deletion
templates/video.html
with
113 additions
and
37 deletions
static/css/application.css
+
43
−
18
View file @
8b563c0c
...
...
@@ -3056,19 +3056,6 @@ 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#slider a.ui-slider-handle:focus, section.course-content div.video-subtitles div.video-wrapper section.video-controls div#slider a.ui-slider-handle:hover {
background-color: #bf4040;
outline: none; }
section.course-content div.video-subtitles div.video-wrapper section.video-controls div#slider:hover {
height: 14px;
margin-top: -7px; }
section.course-content div.video-subtitles div.video-wrapper section.video-controls div#slider:hover a.ui-slider-handle {
-webkit-border-radius: 20px;
-moz-border-radius: 20px;
-ms-border-radius: 20px;
-o-border-radius: 20px;
border-radius: 20px;
height: 20px;
margin-left: -10px;
top: -4px;
width: 20px; }
section.course-content div.video-subtitles div.video-wrapper section.video-controls ul.vcr {
float: left;
margin-right: 22.652px; }
...
...
@@ -3314,6 +3301,21 @@ section.course-content div.video-subtitles div.video-wrapper section.video-contr
opacity: .7; }
section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls a.hide-subtitles.off:after {
content: "turn on"; }
section.course-content div.video-subtitles div.video-wrapper:hover section.video-controls ul, section.course-content div.video-subtitles div.video-wrapper:hover section.video-controls div {
opacity: 1; }
section.course-content div.video-subtitles div.video-wrapper:hover section.video-controls div#slider {
height: 14px;
margin-top: -7px; }
section.course-content div.video-subtitles div.video-wrapper:hover section.video-controls div#slider a.ui-slider-handle {
-webkit-border-radius: 20px;
-moz-border-radius: 20px;
-ms-border-radius: 20px;
-o-border-radius: 20px;
border-radius: 20px;
height: 20px;
margin-left: -10px;
top: -4px;
width: 20px; }
section.course-content div.video-subtitles ol.subtitles {
float: left;
width: 31.522%;
...
...
@@ -3363,19 +3365,42 @@ 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;
padding
: 0;
bottom
: 0;
height: 100%;
position: fixed;
left: 0;
max-height: 100%;
padding: 0;
position: fixed;
top: 0;
bottom: 0;
width: 100%;
max-height: 100%;
z-index: 999; }
section.course-content div.video-subtitles.fullscreen a.exit {
position: absolute;
top: 20px;
right: 20px;
color: #aaa;
text-transform: uppercase;
letter-spacing: 1px;
font-style: 12px; }
section.course-content div.video-subtitles.fullscreen a.exit::after {
content: "✖";
display: -moz-inline-box;
-moz-box-orient: vertical;
display: inline-block;
vertical-align: baseline;
zoom: 1;
*display: inline;
*vertical-align: auto;
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 {
padding: 20px;
vertical-align: middle;
min-height: 100%;
max-height: 100%;
overflow-y: scroll; }
section.course-content div.video-subtitles.fullscreen div.tc-wrapper object#myytplayer {
max-height: 100%;
overflow: hidden; }
section.course-content div.video-subtitles.fullscreen ol.subtitles li {
color: #aaa; }
...
...
This diff is collapsed.
Click to expand it.
templates/sass/courseware/_video.scss
+
51
−
18
View file @
8b563c0c
...
...
@@ -136,18 +136,6 @@ section.course-content {
}
}
&
:hover
{
height
:
14px
;
margin-top
:
-7px
;
a
.ui-slider-handle
{
@include
border-radius
(
20px
);
height
:
20px
;
margin-left
:
-10px
;
top
:
-4px
;
width
:
20px
;
}
}
}
ul
.vcr
{
...
...
@@ -336,6 +324,25 @@ section.course-content {
}
}
}
&
:hover
section
.video-controls
{
ul
,
div
{
opacity
:
1
;
}
div
#slider
{
height
:
14px
;
margin-top
:
-7px
;
a
.ui-slider-handle
{
@include
border-radius
(
20px
);
height
:
20px
;
margin-left
:
-10px
;
top
:
-4px
;
width
:
20px
;
}
}
}
}
ol
.subtitles
{
...
...
@@ -388,21 +395,47 @@ section.course-content {
&
.fullscreen
{
background
:
rgba
(
#000
,
.95
);
border
:
0
;
padding
:
0
;
bottom
:
0
;
height
:
100%
;
position
:
fixed
;
left
:
0
;
max-height
:
100%
;
padding
:
0
;
position
:
fixed
;
top
:
0
;
bottom
:
0
;
width
:
100%
;
max-height
:
100%
;
z-index
:
999
;
a
.exit
{
position
:
absolute
;
top
:
20px
;
right
:
20px
;
color
:
#aaa
;
text-transform
:
uppercase
;
letter-spacing
:
1px
;
font-style
:
12px
;
&
::after
{
content
:
"✖"
;
@include
inline-block
();
padding-left
:
6px
;
}
&
:hover
{
color
:
$mit-red
;
}
}
div
.tc-wrapper
{
padding
:
20px
;
vertical-align
:
middle
;
min-height
:
100%
;
overflow
:
hidden
;
max-height
:
100%
;
overflow-y
:
scroll
;
object
#myytplayer
{
max-height
:
100%
;
overflow
:
hidden
;
}
}
ol
.subtitles
{
...
...
This diff is collapsed.
Click to expand it.
templates/video.html
+
19
−
1
View file @
8b563c0c
...
...
@@ -69,11 +69,29 @@
<
%
block
name=
"js_extra"
>
<script
type=
"text/javascript"
charset=
"utf-8"
>
$
(
function
()
{
$
(
'
.add-fullscreen
'
).
click
(
function
(){
$
(
'
.add-fullscreen
'
).
click
(
function
()
{
//var window_height = $(window).height();
//var video_height = (window_height - 97) + 'px';
//$('div.video-wrapper, div.tc-wrapper').css('max-height', window_height);
//$('object#myytplayer').css('height', video_height);
$
(
'
div.video-subtitles
'
).
toggleClass
(
'
fullscreen
'
);
if
(
$
(
'
div.video-subtitles
'
).
hasClass
(
'
fullscreen
'
))
{
$
(
'
div.video-subtitles
'
).
append
(
'
<a href="#" class="exit">Exit</a>
'
);
}
else
{
$
(
'
a.exit
'
).
remove
();
}
$
(
'
.exit
'
).
click
(
function
()
{
$
(
'
div.video-subtitles
'
).
removeClass
(
'
fullscreen
'
);
$
(
this
).
remove
();
return
false
;
});
return
false
;
});
$
(
'
.hide-subtitles
'
).
click
(
function
()
{
$
(
'
div.video-subtitles
'
).
toggleClass
(
'
closed
'
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment