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
d4a462bd
Commit
d4a462bd
authored
Apr 04, 2012
by
Kyle Fiedler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
only transform height and witdh
parent
c8a436eb
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
18 deletions
+18
-18
static/css/application.css
+15
-15
templates/sass/courseware/_video.scss
+2
-2
templates/video_init.js
+1
-1
No files found.
static/css/application.css
View file @
d4a462bd
...
@@ -2920,11 +2920,11 @@ section.course-content div.video-subtitles div.video-wrapper section.video-contr
...
@@ -2920,11 +2920,11 @@ section.course-content div.video-subtitles div.video-wrapper section.video-contr
border-top
:
1px
solid
#000
;
border-top
:
1px
solid
#000
;
border-bottom
:
1px
solid
#000
;
border-bottom
:
1px
solid
#000
;
height
:
7px
;
height
:
7px
;
-webkit-transition-property
:
all
;
-webkit-transition-property
:
height
,
2s
,
ease-in-out
;
-moz-transition-property
:
all
;
-moz-transition-property
:
height
,
2s
,
ease-in-out
;
-ms-transition-property
:
all
;
-ms-transition-property
:
height
,
2s
,
ease-in-out
;
-o-transition-property
:
all
;
-o-transition-property
:
height
,
2s
,
ease-in-out
;
transition-property
:
all
;
transition-property
:
height
,
2s
,
ease-in-out
;
-webkit-transition-duration
:
0.15s
;
-webkit-transition-duration
:
0.15s
;
-moz-transition-duration
:
0.15s
;
-moz-transition-duration
:
0.15s
;
-ms-transition-duration
:
0.15s
;
-ms-transition-duration
:
0.15s
;
...
@@ -2997,16 +2997,16 @@ section.course-content div.video-subtitles div.video-wrapper section.video-contr
...
@@ -2997,16 +2997,16 @@ section.course-content div.video-subtitles div.video-wrapper section.video-contr
margin-left
:
-7px
;
margin-left
:
-7px
;
top
:
-4px
;
top
:
-4px
;
width
:
15px
;
width
:
15px
;
-webkit-transition-property
:
all
;
-webkit-transition-property
:
height
,
2s
,
ease-in-out
;
-moz-transition-property
:
all
;
-moz-transition-property
:
height
,
2s
,
ease-in-out
;
-ms-transition-property
:
all
;
-ms-transition-property
:
height
,
2s
,
ease-in-out
;
-o-transition-property
:
all
;
-o-transition-property
:
height
,
2s
,
ease-in-out
;
transition-property
:
all
;
transition-property
:
height
,
2s
,
ease-in-out
;
-webkit-transition-duration
:
0.15s
;
-webkit-transition-duration
:
width
,
2s
,
ease-in-out
;
-moz-transition-duration
:
0.15s
;
-moz-transition-duration
:
width
,
2s
,
ease-in-out
;
-ms-transition-duration
:
0.15s
;
-ms-transition-duration
:
width
,
2s
,
ease-in-out
;
-o-transition-duration
:
0.15s
;
-o-transition-duration
:
width
,
2s
,
ease-in-out
;
transition-duration
:
0.15s
;
transition-duration
:
width
,
2s
,
ease-in-out
;
-webkit-transition-timing-function
:
ease-out
;
-webkit-transition-timing-function
:
ease-out
;
-moz-transition-timing-function
:
ease-out
;
-moz-transition-timing-function
:
ease-out
;
-ms-transition-timing-function
:
ease-out
;
-ms-transition-timing-function
:
ease-out
;
...
...
templates/sass/courseware/_video.scss
View file @
d4a462bd
...
@@ -74,7 +74,7 @@ section.course-content {
...
@@ -74,7 +74,7 @@ section.course-content {
border-top
:
1px
solid
#000
;
border-top
:
1px
solid
#000
;
border-bottom
:
1px
solid
#000
;
border-bottom
:
1px
solid
#000
;
height
:
7px
;
height
:
7px
;
@include
transition
();
@include
transition
(
height
2
.0s
ease-in-out
);
div
.ui-widget-header
{
div
.ui-widget-header
{
background
:
#777
;
background
:
#777
;
...
@@ -121,7 +121,7 @@ section.course-content {
...
@@ -121,7 +121,7 @@ section.course-content {
margin-left
:
-7px
;
margin-left
:
-7px
;
top
:
-4px
;
top
:
-4px
;
width
:
15px
;
width
:
15px
;
@include
transition
();
@include
transition
(
height
2
.0s
ease-in-out
,
width
2
.0s
ease-in-out
);
@include
background-size
(
50%
);
@include
background-size
(
50%
);
&
:focus
,
&
:hover
{
&
:focus
,
&
:hover
{
...
...
templates/video_init.js
View file @
d4a462bd
...
@@ -27,7 +27,7 @@ var captions=0;
...
@@ -27,7 +27,7 @@ var captions=0;
var
slider
=
$
(
'#slider'
)
var
slider
=
$
(
'#slider'
)
.
slider
({
.
slider
({
range
:
"min"
,
range
:
"min"
,
slide
:
function
(
event
,
ui
)
{
slide
:
function
(
event
,
ui
)
{
var
slider_time
=
format_time
(
ui
.
value
)
var
slider_time
=
format_time
(
ui
.
value
)
...
...
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