Merge branch 'brittany' of github.com:dementrock/mitx into merge

lms/static/sass/_discussion.scss

@@ -381,6 +381,10 @@ $tag-text-color: #5b614f;
           margin-top: 10px;
           width: 95%;
         }
+
+        .reply-post-control {
+          margin-top: 1%;
+        }
       }
     }
 
@@ -459,7 +463,8 @@ $tag-text-color: #5b614f;
   }
 
   .search-wrapper {
-    height: 110px;
+    margin-bottom: 50px;
+    margin-left: .5%;
   }
 
   .discussion-search-form {
@@ -726,10 +731,25 @@ $tag-text-color: #5b614f;
     .new-post-control {
       margin-left: 75%;
       margin-top: 1%;
+
+     .discussion-cancel-post {
+        margin-right: 1.5%;
+      } 
     }
 
+    .reply-post-control {
+
+      .discussion-cancel-post {
+        margin-right: 1.5%;
+      }
+    }
+    
     .edit-post-control {
       margin-top: 1%;
+
+      .discussion-cancel-update {
+        margin-right: 1.5%;
+      }
     }
 
     .control-button {
@@ -758,6 +778,10 @@ $tag-text-color: #5b614f;
     }
   }
 
+  .discussion-content-edit {
+    margin: 3%;
+  }
+
   .new-post-form {
     margin: 10px 0 40px 0;
   }