diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_courseware.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_courseware.scssc index 59d180664c..b5d1069c89 100644 Binary files a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_courseware.scssc and b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_courseware.scssc differ diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_layout.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_layout.scssc index 9f5aa2dcea..a04a7966da 100644 Binary files a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_layout.scssc and b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_layout.scssc differ diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_local.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_local.scssc index ff1f29cf58..42d1a7db67 100644 Binary files a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_local.scssc and b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_local.scssc differ diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_theme.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_theme.scssc index 9e07958d19..e3e261c1dd 100644 Binary files a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_theme.scssc and b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_theme.scssc differ diff --git a/sass/_courseware.scss b/sass/_courseware.scss index ada6ac6fd4..6950690489 100644 --- a/sass/_courseware.scss +++ b/sass/_courseware.scss @@ -35,12 +35,12 @@ div.course-wrapper { } &.ui-state-active { + @include box-shadow(none); background: none; - border-bottom: 1px solid #aaa; border: 0; + border-bottom: 1px solid #aaa; color: #000; font-weight: bold; - @include box-shadow(none); a { color: #000; @@ -53,9 +53,9 @@ div.course-wrapper { @include border-radius(0); @include box-shadow( inset -1px 0 0 #e6e6e6); background: #d6d6d6; - border: none; - border-top: 1px solid #c3c3c3; border-bottom: 1px solid #c3c3c3; + border-top: 1px solid #c3c3c3; + border: none; font-size: 12px; margin: 0; @@ -73,5 +73,85 @@ div.course-wrapper { padding: $gw-gutter; vertical-align: top; width: grid-width(9); + + ol.vert-mod { + li { + @extend .clearfix; + } + } + + ol.sequence-nav { + margin-bottom: $body-line-height; + + li { + cursor: pointer; + display: table-cell; + min-width: 30px; + min-height: 30px; + padding: 0 10px; + } + } + + div.video-wrapper { + float: left; + width: 640px; + min-height: 500px; + + section { + ul { + display: inline-block; + + li { + margin-top: 5px; + display: inline-block; + cursor: pointer; + + 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: 8px; + cursor: pointer; + + &.current { + background-color: #f3f3f3; + } + + &:hover { + color: $mit-red; + } + } + } } } diff --git a/sass/_layout.scss b/sass/_layout.scss index 9cd10127cb..4e7dd4fa42 100644 --- a/sass/_layout.scss +++ b/sass/_layout.scss @@ -18,7 +18,6 @@ html { @extend .wrapper; @include box-sizing(border-box); padding: 0 $body-line-height; - text-shadow: 0 -1px 0 darken($mit-red, 10%); h1 { border-right: 1px solid darken($mit-red, 5%); @@ -28,13 +27,15 @@ html { padding: 15px $gw-gutter 15px 0; display: block; float: left; - color: #fff; + color: #000; + text-shadow: 0 1px 0 lighten($mit-red, 10%); } nav { float: left; display: block; margin: 0; + text-shadow: 0 -1px 0 darken($mit-red, 10%); ul { @extend .clearfix; diff --git a/sass/_local.scss b/sass/_local.scss index 7da2a7af07..3f11d9ca57 100644 --- a/sass/_local.scss +++ b/sass/_local.scss @@ -12,10 +12,6 @@ margin-right: 0px; } -#bodyContent { - width: 100%; -} - .bordered { border: 1px solid #AAAAAA; border-style : dotted; } .seq_problem_visited { background-color: #ccccaa;} diff --git a/sass/_theme.scss b/sass/_theme.scss index 21ed3895bf..6aed8d9750 100644 --- a/sass/_theme.scss +++ b/sass/_theme.scss @@ -140,10 +140,6 @@ a:hover { background: transparent url( images/css/page-bg.jpg ) no-repeat center top; } - - - - #container { margin:0 auto; width:800px; @@ -184,7 +180,7 @@ a:hover { #sidebar ul.vmenu { list-style: none; text-align: left; - margin: 7px 0px 8px 0px; + margin: 7px 0px 8px 0px; padding: 0; text-decoration: none; border-top: 1px solid #eeeeee; diff --git a/seq_module.html b/seq_module.html index bcb830b9b3..c2891af8f9 100644 --- a/seq_module.html +++ b/seq_module.html @@ -1,11 +1,13 @@ -% for t in range(1,1+len(items)): -
    -
  1.  
  2. -
-% endfor +
    + + % for t in range(1,1+len(items)): +
  1.  
  2. + % endfor + +
  3. Previous
  4. +
  5. Next
  6. +
-
Previous
-
Next
diff --git a/staticbook.html b/staticbook.html index d08a96727c..af3cade9cb 100644 --- a/staticbook.html +++ b/staticbook.html @@ -48,7 +48,7 @@ function next_page() {