diff --git a/courseware.html b/courseware.html index af3b721e2e..67e596545e 100644 --- a/courseware.html +++ b/courseware.html @@ -1,11 +1,13 @@ <%inherit file="main.html" /> +<%block name="js_extra"> + <%include file="navigation.html" args="active_page='courseware'" /> diff --git a/main.html b/main.html index 76a035c449..f7a4e2a90c 100644 --- a/main.html +++ b/main.html @@ -9,11 +9,6 @@ - - - - - - <%block name="headextra"/> diff --git a/navigation.html b/navigation.html index bba364d18b..345e6eaa3c 100644 --- a/navigation.html +++ b/navigation.html @@ -11,8 +11,8 @@
  • Courseware
  • Course Info
  • Textbook
    • -
  • Discussion
    • -
  • Wiki
    • +
  • Discussion
    • +
  • Wiki
  • Profile
    • diff --git a/sass/_info.scss b/sass/_info.scss index 9e67b5c657..418cc1a00a 100644 --- a/sass/_info.scss +++ b/sass/_info.scss @@ -27,10 +27,16 @@ div.info-wrapper { margin: 0 flex-gutter() 0 0; } - p { + section.update-description { float: left; width: flex-grid(7, 9); margin-bottom: 0; + + p { + &:last-child { + margin-bottom: 0; + } + } } } } diff --git a/sass/_profile.scss b/sass/_profile.scss index a9dfb886a6..669daecffb 100644 --- a/sass/_profile.scss +++ b/sass/_profile.scss @@ -77,7 +77,7 @@ div.profile-wrapper { width: 100%; h2 { - border-right: 1px dotted #ccc; + border-right: 1px dashed #ddd; @include box-sizing(border-box); display: table-cell; margin: 0; diff --git a/sass/courseware/_amplifier.scss b/sass/courseware/_amplifier.scss index 19c7ab9a2b..963fdfd0cb 100644 --- a/sass/courseware/_amplifier.scss +++ b/sass/courseware/_amplifier.scss @@ -1,9 +1,10 @@ // JM MOSFET AMPLIFIER div#graph-container { @extend .clearfix; - + border-top: 1px solid #ddd; + padding-top: lh(1.0); + canvas#graph { - background-color: rgb(60, 60, 100); width: flex-grid(4.5, 9); float: left; margin-right: flex-gutter(9); @@ -46,7 +47,6 @@ div#schematic-container { @extend .clearfix; canvas { - background-color: rgb(60, 60, 100); width: flex-grid(4.5, 9); float: left; margin-right: flex-gutter(9); diff --git a/sass/courseware/_courseware.scss b/sass/courseware/_courseware.scss index f408f3cbb0..52525a5a88 100644 --- a/sass/courseware/_courseware.scss +++ b/sass/courseware/_courseware.scss @@ -36,7 +36,7 @@ div.course-wrapper { margin-bottom: 15px; width: flex-grid(2, 9); padding-right: flex-gutter(9); - border-right: 1px dotted #ccc; + border-right: 1px dashed #ddd; @include box-sizing(border-box); display: table-cell; vertical-align: top; @@ -145,7 +145,7 @@ div.course-wrapper { div#seq_content { h1 { background: none; - margin-bottom: 0; + margin-bottom: lh(); padding-bottom: 0; border-bottom: none; } diff --git a/sass/courseware/_video.scss b/sass/courseware/_video.scss index 22e90916d5..0836d07158 100644 --- a/sass/courseware/_video.scss +++ b/sass/courseware/_video.scss @@ -54,6 +54,7 @@ section.course-content { section.video-controls { @extend .clearfix; background: #333; + position: relative; border: 1px solid #000; color: #ccc; @@ -133,22 +134,47 @@ section.course-content { float: right; div.speeds { + border-right: 1px solid #000; + border-left: 1px solid #000; + @include box-shadow(1px 0 0 #555, inset 1px 0 0 #555); float: left; line-height: 46px; //height of play pause buttons - padding-right: lh(); margin-right: 0; -webkit-font-smoothing: antialiased; - @include box-shadow(1px 0 0 #555); - border-right: 1px solid #000; - div#video_speeds { - @include inline-block(); + h3 { + a { + color: #fff; + display: block; + padding: 0 lh(.5); + + &:hover { + text-decoration: none; + background-color: #444; + } + } + } + + ol#video_speeds { + @extend .clearfix; + background: #333; + border: 1px solid #000; font-weight: bold; + @include inline-block(); + padding: 0 lh(); + position: absolute; + right: 79px; + @include box-shadow(inset 0 1px 0 #555); - span { - @include inline-block(); + li { cursor: pointer; + float: left; margin-bottom: 0; + margin-right: lh(.5); + + &:last-child { + margin-right: 0; + } &:hover { color: $mit-red; diff --git a/sass/discussion/_question-view.scss b/sass/discussion/_question-view.scss index e004d08ae3..c6ee7a75da 100644 --- a/sass/discussion/_question-view.scss +++ b/sass/discussion/_question-view.scss @@ -100,7 +100,7 @@ div.question-header { display: inline-block; float: left; width: flex-grid(1.8,8); - border-left: 1px dotted #CCC; + border-left: 1px dashed #ddd; div.post-update-info { @include box-sizing(border-box); diff --git a/sass/index/_footer.scss b/sass/index/_footer.scss index ec1a1c2f37..dc3747dd64 100644 --- a/sass/index/_footer.scss +++ b/sass/index/_footer.scss @@ -59,6 +59,10 @@ footer { position: relative; top: -5px; + @media screen and (max-width: 780px) { + float: none; + } + li { float: left; margin-right: lh(.5); diff --git a/video.html b/video.html index 394e8f591e..b5ac71ba55 100644 --- a/video.html +++ b/video.html @@ -28,7 +28,8 @@
    - Speed:
    +

    Speed

    +
      on @@ -68,6 +69,14 @@ $(this).text((link_text == 'on') ? 'off' : 'on'); return false; }); + + + $('.speeds ol').hide(); + + $('.speeds h3 a').click(function() { + $('.speeds ol').toggle(); + return false; + }); }); diff --git a/video_init.js b/video_init.js index 0ec2fe2e2c..5ed773b98f 100644 --- a/video_init.js +++ b/video_init.js @@ -34,9 +34,13 @@ loadNewVideo(streams["1.0"], ${ position }); function add_speed(key, stream) { var id = 'speed_' + stream; - $("#video_speeds").append(' '+key+'x'); + + $("#video_speeds").append('
    1. '+key+'x
      2. '); + $("#"+id).click(function(){ change_video_speed(key, stream); + $(this).siblings().removeClass("active"); + $(this).addClass("active"); }); }