Merge branch 'master' into feature/arjun/new-discussions

lms/static/sass/base/_base.scss

@@ -2,6 +2,7 @@ html, body {
   background: rgb(250,250,250);
   font-family: $sans-serif;
   font-size: 1em;
+  font-style: normal;
   line-height: 1em;
   //-webkit-font-smoothing: antialiased;
 }
@@ -42,6 +43,7 @@ p {
 
 span {
   font: normal 1em/1.6em $sans-serif;
+  color: $base-font-color;
 }
 
 /* Fix for CodeMirror: prevent top-level span from affecting deeply-embedded span in CodeMirror */

lms/static/sass/course/_info.scss

@@ -22,45 +22,52 @@ div.info-wrapper {
         @extend .clearfix;
         border-bottom: 1px solid lighten($border-color, 10%);
         list-style-type: disk;
-        margin-bottom: lh();
-        padding-bottom: lh(.5);
-
-        &:first-child {
-          margin: 0 (-(lh(.5))) lh();
-          padding: lh(.5);
-        }
+        margin-bottom: lh(1.5);
+        padding-bottom: lh(.75);
 
         ol, ul {
-          margin: 0;
-          list-style-type: disk;
-
           ol,ul {
-            list-style-type: circle;
+            list-style-type: disc;
           }
         }
 
         h2 {
-          float: left;
           font-size: $body-font-size;
           font-weight: bold;
-          margin: 0 flex-gutter() 0 0;
-          width: flex-grid(2, 9);
+          background: url('../images/calendar-icon.png') 0 center no-repeat;
+          padding-left: 20px;
         }
 
         section.update-description {
-          float: left;
-          margin-bottom: 0;
-          width: flex-grid(7, 9);
+          section {
+            &.primary {
+              border: 1px solid #DDD;
+              background: #F6F6F6;
+              padding: 20px;
+
+              p {
+                font-weight: bold;
+              }
+              .author {
+                font-weight: normal;
+                font-style: italic;
+              }
+            }
+          }
+
+          h3 {
+            font-size: 1em;
+            font-weight: bold;
+            margin: lh(1.5) 0 lh(.5);
+          }
+
+          > ul {
+            list-style-type: disc;
+          }
 
           li {
             margin-bottom: lh(.5);
           }
-
-          p {
-            &:last-child {
-              margin-bottom: 0;
-            }
-          }
         }
       }
     }

lms/static/sass/course/courseware/_courseware.scss

@@ -80,7 +80,6 @@ div.course-wrapper {
         }
 
         .histogram {
-          display: none;
           width: 200px;
           height: 150px;
         }
@@ -88,7 +87,7 @@ div.course-wrapper {
         ul {
           list-style: disc outside none;
           padding-left: 1em;
-          
+
           &.discussion-errors {
             list-style: none;
             padding-left: 2em;
@@ -99,6 +98,10 @@ div.course-wrapper {
           }
         }
 
+        nav.sequence-nav ul li.prev {
+          left: 4px;
+        }
+
         nav.sequence-bottom {
           ul {
           list-style: none;
@@ -117,6 +120,7 @@ div.course-wrapper {
         margin: 0;
         @include clearfix();
         padding: 0;
+        list-style: none;
 
         li {
           width: flex-grid(3, 9);

lms/static/sass/course/courseware/_sidebar.scss

@@ -119,13 +119,18 @@ section.course-index {
             margin-bottom: 0;
             line-height: 1.3;
 
-            span.subtitle {
+            &.subtitle {
               color: #666;
               font-size: 13px;
               font-weight: normal;
               display: block;
+              margin: 0;
+
+              &:empty {
+                display: none;
+              }
             }
-          }          
+          }
 
           &:hover {
             background: rgba(0, 0, 0, .1);

lms/static/sass/ie.scss

@@ -2,12 +2,14 @@
 @import "base/variables";
 
 // These are all quick solutions for IE please rewrite
+//Make overlay white because ie doesn't like rgba
 .highlighted-courses .courses .course header.course-preview, .find-courses .courses .course header.course-preview,
 .home .highlighted-courses > h2, .home .highlighted-courses > section.outside-app h1, section.outside-app .home .highlighted-courses > h1,
 header.global {
   background: #FFF;
 }
 
+// hide all actions
 .home > header .title .actions,
 .home > header .title:hover .actions {
   display: none;
@@ -34,10 +36,12 @@ header.global {
   }
 }
 
+// because ie doesn't like :last
 .last {
   margin-right: 0  !important;
 }
 
+// make partners not animate
 .home .university-partners .partners a {
   .name {
     position: static;
@@ -61,7 +65,6 @@ header.global {
 
 }
 
-
 .home .university-partners .partners { 
   width: 660px;
 
@@ -74,6 +77,7 @@ header.global {
   }
 }
 
+// make animations on homepage not animate and show everything
 .highlighted-courses .courses .course, .find-courses .courses .course {
   .meta-info {
     display: none;
@@ -126,10 +130,24 @@ header.global {
   }
 }
 
+// make overlay flat black since IE cant handle rgba
 #lean_overlay {
   background: #000;
 }
 
-.modal .inner-wrapper form label {
-  display: block;
+// active navigation
+nav.course-material ol.course-tabs li a.active, nav.course-material .xmodule_SequenceModule nav.sequence-nav ol.course-tabs li a.seq_video.active, .xmodule_SequenceModule nav.sequence-nav nav.course-material ol.course-tabs li a.seq_video.active {
+  background-color: #333;
+  background-color: rgba(0, 0, 0, .4);
+}
+
+// make dropdown user consistent size
+header.global ol.user > li.primary a.dropdown {
+  padding-top: 6px;
+  padding-bottom: 6px;
+}
+
+// always hide arrow in IE
+.dashboard .my-courses .my-course .cover .arrow {
+  display: none;
 }

lms/static/sass/multicourse/_course_about.scss

@@ -335,13 +335,43 @@
 
   .course-sidebar {
     @include box-sizing(border-box);
-    @include box-shadow(inset 0 0 3px 0 rgba(0,0,0, 0.15));
-    border: 1px solid rgb(200,200,200);
-    border-top: none;
     float: left;
-    padding: 16px 20px 30px;
     width: flex-grid(4);
 
+    > section {
+      @include box-shadow(inset 0 0 3px 0 rgba(0,0,0, 0.15));
+      border: 1px solid rgb(200,200,200);
+
+      &.course-summary {
+        padding: 16px 20px 30px;
+        margin-bottom: 220px;
+        border-top: none;
+      }
+
+      &.additional-resources {
+        padding: 30px;
+
+        .opencourseware {
+          text-indent: -9999px;
+          background: url('../images/opencourseware.png') 0 0 no-repeat;
+          width: 266px;
+          height: 31px;
+          margin-bottom: 20px;
+        }
+
+        ul {
+          padding-left: 0;
+          margin-bottom: 0;
+        }
+
+        li {
+          list-style: none;
+          padding-left: 29px;
+          background: url('../images/link-icon.png') left center no-repeat;
+        }
+      }
+    }
+
     header {
       margin-bottom: 30px;
       padding-bottom: 16px;
@@ -441,6 +471,13 @@
           }
         }
       }
+
+      h1 {
+        font: 1em $serif;
+        letter-spacing: 0;
+        color: #999;
+        margin-bottom: 0;
+      }
     }
 
     .important-dates {

lms/static/sass/shared/_footer.scss

@@ -110,6 +110,7 @@ footer {
           padding: 0;
 
           a {
+            @include inline-block;
             opacity: 0.3;
             @include transition(all, 0.1s, linear);
 

lms/static/sass/shared/_modal.scss

@@ -147,7 +147,7 @@
       }
 
       label {
-        display: none;
+        color: #999;
 
         &.field-error {
           display: block;