Merge

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;
+            }
+          }
         }
       }
     }

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;

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); 

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;
       }

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;

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);

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);