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
57d129a3
Commit
57d129a3
authored
Jan 26, 2012
by
Kyle Fiedler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Start to fix video layout
--HG-- branch : kf-video-layout
parent
7c12d9c2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
91 deletions
+12
-91
sass/_courseware.scss
+4
-83
sass/application.scss
+1
-1
video.html
+7
-7
No files found.
sass/_courseware.scss
View file @
57d129a3
div
.course-wrapper
{
@extend
.table-wrapper
;
ul
,
ol
{
list-style
:
none
;
}
div
#accordion
{
@extend
.sidebar
;
...
...
@@ -112,88 +116,5 @@ div.course-wrapper {
padding
:
0
10px
;
}
}
div
.video-wrapper
{
float
:
left
;
width
:
640px
;
min-height
:
620px
;
iframe
#html5_player
{
border
:
none
;
display
:
none
;
height
:
390px
;
width
:
640px
;
}
section
{
ul
{
display
:
inline-block
;
li
{
margin-top
:
5px
;
display
:
inline-block
;
cursor
:
pointer
;
border
:
0
;
padding
:
0
;
div
{
&
:empty
{
display
:
none
;
}
}
}
}
div
#slider
{
margin
:
-14px
0
10px
60px
;
}
div
#vidtime
{
float
:
left
;
}
div
#video_speeds
{
float
:
right
;
cursor
:
pointer
;
span
{
&
:hover
{
color
:
$mit-red
;
}
}
}
}
}
ol
.subtitles
{
width
:
220px
;
margin-left
:
20px
;
float
:
left
;
li
{
margin-bottom
:
0px
;
cursor
:
pointer
;
border
:
0
;
padding
:
0
;
color
:
#666
;
&
.current
{
background-color
:
#f3f3f3
;
color
:
#333
;
}
&
:hover
{
color
:
$mit-red
;
}
div
{
margin-bottom
:
8px
;
}
div
:empty
{
margin-bottom
:
0px
;
}
}
}
}
}
sass/application.scss
View file @
57d129a3
...
...
@@ -8,7 +8,7 @@
@import
"leanmodal"
;
// pages
@import
"courseware"
;
@import
"courseware"
,
"courseware-video"
;
@import
"textbook"
;
@import
"profile"
;
@import
"wiki-create"
,
"wiki"
;
...
...
video.html
View file @
57d129a3
<div
class=
"video-wrapper"
>
<div
id=
"ytapiplayer"
>
<div
class=
"video-player"
>
<div
id=
"ytapiplayer"
>
</div>
<!-- TODO(Ernie/Kyle) move styles to css -->
<iframe
id=
"html5_player"
type=
"text/html"
frameborder=
"0"
>
</iframe>
</div>
<!-- TODO(Ernie/Kyle) move styles to css -->
<iframe
id=
"html5_player"
type=
"text/html"
frameborder=
"0"
>
</iframe>
<section
class=
"video-controls"
>
<ul>
<li><span
class=
"ui-icon ui-icon-play"
onclick=
"play();"
></span></li>
...
...
@@ -19,8 +21,6 @@
</section>
</div>
<ol
class=
"subtitles"
>
<li
id=
stt_n5
><div
id=
std_n7
onclick=
"title_seek(-7);"
></div></li>
<li
id=
stt_n4
><div
id=
std_n6
onclick=
"title_seek(-6);"
></div></li>
...
...
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