Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
b209d363
Commit
b209d363
authored
Aug 16, 2012
by
Calen Pennington
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #433 from MITx/feature/kfiedler/courseware-style
Made video go to the center of the screen in full screen
parents
432f7bcc
bfed4918
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
26 deletions
+11
-26
common/lib/xmodule/xmodule/css/video/display.scss
+10
-23
common/lib/xmodule/xmodule/js/src/video/display/video_player.coffee
+1
-3
No files found.
common/lib/xmodule/xmodule/css/video/display.scss
View file @
b209d363
...
@@ -14,7 +14,7 @@ div.video {
...
@@ -14,7 +14,7 @@ div.video {
section
.video-player
{
section
.video-player
{
height
:
0
;
height
:
0
;
//
overflow: hidden;
overflow
:
hidden
;
padding-bottom
:
56
.25%
;
padding-bottom
:
56
.25%
;
position
:
relative
;
position
:
relative
;
...
@@ -444,13 +444,13 @@ div.video {
...
@@ -444,13 +444,13 @@ div.video {
height
:
100%
;
height
:
100%
;
left
:
0
;
left
:
0
;
margin
:
0
;
margin
:
0
;
max-height
:
100%
;
overflow
:
hidden
;
overflow
:
hidden
;
padding
:
0
;
padding
:
0
;
position
:
fixed
;
position
:
fixed
;
top
:
0
;
top
:
0
;
width
:
100%
;
width
:
100%
;
z-index
:
999
;
z-index
:
999
;
vertical-align
:
middle
;
&
.closed
{
&
.closed
{
ol
.subtitles
{
ol
.subtitles
{
...
@@ -459,30 +459,17 @@ div.video {
...
@@ -459,30 +459,17 @@ div.video {
}
}
}
}
a
.exit
{
color
:
#aaa
;
display
:
none
;
font-style
:
12px
;
left
:
20px
;
letter-spacing
:
1px
;
position
:
absolute
;
text-transform
:
uppercase
;
top
:
20px
;
&
:
:
after
{
content
:
"✖"
;
@include
inline-block
();
padding-left
:
6px
;
}
&
:hover
{
color
:
$mit-red
;
}
}
div
.tc-wrapper
{
div
.tc-wrapper
{
@include
clearfix
;
display
:
table
;
width
:
100%
;
height
:
100%
;
article
.video-wrapper
{
article
.video-wrapper
{
width
:
100%
;
width
:
100%
;
display
:
table-cell
;
vertical-align
:
middle
;
float
:
none
;
}
}
object
,
iframe
{
object
,
iframe
{
...
...
common/lib/xmodule/xmodule/js/src/video/display/video_player.coffee
View file @
b209d363
...
@@ -130,13 +130,11 @@ class @VideoPlayer extends Subview
...
@@ -130,13 +130,11 @@ class @VideoPlayer extends Subview
toggleFullScreen
:
(
event
)
=>
toggleFullScreen
:
(
event
)
=>
event
.
preventDefault
()
event
.
preventDefault
()
if
@
el
.
hasClass
(
'fullscreen'
)
if
@
el
.
hasClass
(
'fullscreen'
)
@
$
(
'.exit'
).
remove
()
@
$
(
'.add-fullscreen'
).
attr
(
'title'
,
'Fill browser'
)
@
$
(
'.add-fullscreen'
).
attr
(
'title'
,
'Fill browser'
)
@
el
.
removeClass
(
'fullscreen'
)
@
el
.
removeClass
(
'fullscreen'
)
else
else
@
el
.
a
ppend
(
'<a href="#" class="exit">Exit</a>'
).
a
ddClass
(
'fullscreen'
)
@
el
.
addClass
(
'fullscreen'
)
@
$
(
'.add-fullscreen'
).
attr
(
'title'
,
'Exit fill browser'
)
@
$
(
'.add-fullscreen'
).
attr
(
'title'
,
'Exit fill browser'
)
@
$
(
'.exit'
).
click
@
toggleFullScreen
@
caption
.
resize
()
@
caption
.
resize
()
# Delegates
# Delegates
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment