Merge branch 'release' into release-2016-05-03-conflict

2016-05-04 20:01:29 -04:00
parent 816882a130 d6f68ca5ff
commit 868d962002
2 changed files with 2 additions and 2 deletions
--- a/lms/static/sass/course/instructor/_instructor_2.scss
+++ b/lms/static/sass/course/instructor/_instructor_2.scss
@@ -140,6 +140,7 @@
 // ====================
 .instructor-dashboard-content-2 {
  @extend .content;
+  display: block; // override the table-cell display set in .content
  width: 100%;
  padding: 40px;

@@ -2331,4 +2332,4 @@ input[name="subject"] {
    border: 1px solid $lightGrey1;
    cursor: not-allowed;
  }
-}
+}