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
7d9e02cb
Commit
7d9e02cb
authored
Apr 11, 2012
by
Kyle Fiedler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added some bug fixes
parent
74addbc9
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
11 deletions
+36
-11
static/css/application.css
+34
-7
templates/sass/courseware/_video.scss
+0
-1
templates/sass/layout/_layout.scss
+1
-1
templates/video.html
+1
-2
No files found.
static/css/application.css
View file @
7d9e02cb
...
...
@@ -510,8 +510,9 @@ html body div.qtip div.ui-tooltip-content {
border
:
none
;
background
:
rgba
(
0
,
0
,
0
,
0.8
);
color
:
#fff
;
font
:
12px
14px
;
margin-top
:
5px
;
}
font
:
12px
"Open Sans"
,
"Lucida Grande"
,
"Lucida Sans Unicode"
,
"Lucida Sans"
,
Geneva
,
Verdana
,
sans-serif
;
margin-top
:
-30px
;
margin-right
:
-20px
;
}
html
body
section
.outside-app
{
max-width
:
600px
;
padding
:
22.652px
;
}
...
...
@@ -3165,7 +3166,8 @@ 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
.open
{
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
;
}
opacity
:
1
;
display
:
block
;
}
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
;
font-size
:
12px
;
...
...
@@ -3187,6 +3189,7 @@ section.course-content div.video-subtitles div.video-wrapper section.video-contr
-moz-box-shadow
:
inset
1px
0
0
#555555
,
0
2px
0
#444444
;
box-shadow
:
inset
1px
0
0
#555555
,
0
2px
0
#444444
;
left
:
-1px
;
display
:
none
;
position
:
absolute
;
top
:
0
;
width
:
100%
;
...
...
@@ -3309,8 +3312,7 @@ 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
a
.hide-subtitles
:hover
{
color
:
#fff
;
text-decoration
:
none
;
background-color
:
#444
;
background-position
:
11px
center
;
}
background-color
:
#444
;
}
section
.course-content
div
.video-subtitles
div
.video-wrapper
section
.video-controls
div
.secondary-controls
a
.hide-subtitles.off
{
opacity
:
.7
;
}
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
{
...
...
@@ -3386,7 +3388,12 @@ section.course-content div.video-subtitles.fullscreen {
position
:
fixed
;
top
:
0
;
width
:
100%
;
z-index
:
999
;
}
z-index
:
999
;
overflow
:
hidden
;
}
section
.course-content
div
.video-subtitles.fullscreen.closed
ol
.subtitles
{
width
:
auto
;
height
:
auto
;
right
:
-31.984%
;
}
section
.course-content
div
.video-subtitles.fullscreen
a
.exit
{
position
:
absolute
;
top
:
20px
;
...
...
@@ -3432,7 +3439,27 @@ section.course-content div.video-subtitles.fullscreen ol.subtitles {
background
:
rgba
(
0
,
0
,
0
,
0.8
);
padding
:
22.652px
;
max-width
:
23.482%
;
max-height
:
100%
;
}
max-height
:
100%
;
-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
;
}
section
.course-content
div
.video-subtitles.fullscreen
ol
.subtitles
li
{
color
:
#aaa
;
}
section
.course-content
div
.video-subtitles.fullscreen
ol
.subtitles
li
.current
{
...
...
templates/sass/courseware/_video.scss
View file @
7d9e02cb
...
...
@@ -317,7 +317,6 @@ section.course-content {
color
:
#fff
;
text-decoration
:
none
;
background-color
:
#444
;
background-position
:
11px
center
;
}
&
.off
{
...
...
templates/sass/layout/_layout.scss
View file @
7d9e02cb
...
...
@@ -37,7 +37,7 @@ html {
color
:
#fff
;
font
:
12px
$body-font-family
;
margin-top
:
-30px
;
margin-right
:
3
px
;
margin-right
:
-20
px
;
}
}
...
...
templates/video.html
View file @
7d9e02cb
...
...
@@ -74,8 +74,7 @@
$
(
'.add-fullscreen, .hide-subtitles '
).
qtip
({
position
:
{
my
:
'top right'
,
at
:
'top center'
,
target
:
'mouse'
at
:
'top center'
}
});
...
...
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