Merge branch 'master' into release-mergeback-to-master

lms/static/sass/base/_base.scss

@@ -130,9 +130,13 @@ a:visited:not(.btn) {
 }
 
 .content-wrapper {
-  width: flex-grid(12);
-  margin: 0 auto;
-  background: $body-bg;
+  max-width: map-get($container-max-widths, xl);
+  margin-top: $baseline;
+  padding: 0 0 $baseline/2;
+
+  @include media-breakpoint-up(md) {
+    padding: 0 $baseline $baseline/2;
+  }
 
   @media print {
     padding-bottom: 0;

lms/static/sass/base/_layouts.scss

@@ -6,11 +6,6 @@
 body.view-in-course {
   background-color: $body-bg;
 
-  // keep application of widths to window-wrap
-  .window-wrap {
-    min-width: 760px;
-  }
-
   // courseware header
   .header-global,
   .header-global.slim {
@@ -19,7 +14,8 @@ body.view-in-course {
     .wrapper-header {
       min-width: auto;
 
-      .user-dropdown, .dropdown {
+      .user-dropdown,
+      .dropdown {
         padding: ($baseline/2);
       }
     }
@@ -41,7 +37,7 @@ body.view-in-course {
   }
 
   .wrapper-course-material .course-material {
-    padding: ($baseline/2) 0 0 0;
+    padding: 0;
   }
 
   .wrapper-course-material .course-material .course-tabs {
@@ -53,7 +49,6 @@ body.view-in-course {
     max-width: none;
     min-width: initial;
     width: auto;
-    padding: 0 2%;
   }
 
   // course info page

lms/static/sass/base/_mixins.scss

@@ -2,13 +2,13 @@
 // ====================
 
 // mixins - font sizing
-@mixin font-size($sizeValue: 16){
+@mixin font-size($sizeValue: 16) {
   font-size: $sizeValue + px;
   // font-size: ($sizeValue/10) + rem;
 }
 
 // mixins - line height
-@mixin line-height($fontSize: auto){
+@mixin line-height($fontSize: auto) {
   line-height: ($fontSize*1.48) + px;
   // line-height: (($fontSize/10)*1.48) + rem;
 }
@@ -31,7 +31,7 @@
 }
 
 // sunsetted, but still used mixins
-@mixin hide-text(){
+@mixin hide-text() {
   text-indent: -9999px;
   overflow: hidden;
   display: block;