Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into…

Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions

lms/static/sass/_discussion.scss

@@ -1125,12 +1125,13 @@ body.discussion {
   .discussion-column {
     float: right;
     @include box-sizing(border-box);
+    width: 68%;
+    max-width: 800px;
+    min-height: 500px;
     border: 1px solid #aaa;
     border-radius: 3px;
     background: #fff;
     box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
-    width: 68%;
-    min-height: 500px;
 
     &.sidebar-fixed {
       margin-left: 32%;
@@ -1181,7 +1182,7 @@ body.discussion {
       display: block;
       position: absolute;
       top: -1px;
-      right: -2px;
+      right: -1px;
       width: 52px;
       height: 51px;
       background: url(../images/follow-dog-ear.png) 0 -52px no-repeat;

lms/static/sass/course/base/_base.scss

@@ -130,4 +130,66 @@ img {
     font-size: 20px;
     color: rgba(0, 0, 0, .85);
   }
-}
\ No newline at end of file
+}
+
+
+
+.toast-notification {
+  position: fixed;
+  top: 20px;
+  right: 20px;
+  z-index: 99999;
+  max-width: 350px;
+  padding: 15px 20px 17px;
+  border-radius: 3px;
+  border: 1px solid #333;
+  @include linear-gradient(top, rgba(255, 255, 255, .1), rgba(255, 255, 255, 0));
+  background-color: rgba(30, 30, 30, .92);
+  @include box-shadow(0 1px 3px rgba(0, 0, 0, .3), 0 1px 0 rgba(255, 255, 255, .1) inset);
+  font-size: 13px;
+  color: #fff;
+  opacity: 0;
+  @include transition(all .2s);
+
+  .error-icon {
+    display: block;
+    float: left;
+    width: 27px;
+    height: 24px;
+    margin: 0 auto 10px;
+    background: url(../images/large-error-icon.png) no-repeat;
+  }
+
+  strong {
+    display: block;
+    margin-bottom: 10px;
+    font-size: 16px;
+    font-weight: 700;
+    text-align: center;
+  }
+
+  .close-btn {
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 27px;
+    height: 27px;
+    font-size: 22px;
+    font-weight: 700;
+    line-height: 25px;
+    color: #aaa;
+    text-align: center;
+
+    .close-icon {
+      font-size: 16px;
+      font-weight: 700;
+    }
+  }
+
+  .action-btn {
+    @include dark-grey-button;
+    margin-top: 10px;
+    text-align: center;
+  }
+}
+