From f20659f52510125beb2a4e8384520f7e6e8d67c7 Mon Sep 17 00:00:00 2001
From: Brittany Cheng <bcheng42@gmail.com>
Date: Tue, 14 Aug 2012 17:23:40 -0700
Subject: [PATCH 1/3] style fixes

---
 lms/static/sass/_discussion.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss
index 37cf97eb5e..671169a915 100644
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -381,6 +381,10 @@ $tag-text-color: #5b614f;
           margin-top: 10px;
           width: 95%;
         }
+
+        .reply-post-control {
+          margin-top: 1%;
+        }
       }
     }
 

From 46f2407e3951f7ee855849d6658da1cb3f2c7b69 Mon Sep 17 00:00:00 2001
From: Brittany Cheng <bcheng42@gmail.com>
Date: Tue, 14 Aug 2012 17:29:58 -0700
Subject: [PATCH 2/3] style fixes

---
 lms/static/sass/_discussion.scss | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss
index 671169a915..047d590d98 100644
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -463,7 +463,8 @@ $tag-text-color: #5b614f;
   }
 
   .search-wrapper {
-    height: 110px;
+    margin-bottom: 50px;
+    margin-left: .5%;
   }
 
   .discussion-search-form {
@@ -730,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 {

From b9875b80e070781eea4b19a653567b0c96384d30 Mon Sep 17 00:00:00 2001
From: Brittany Cheng <bcheng42@gmail.com>
Date: Tue, 14 Aug 2012 17:36:27 -0700
Subject: [PATCH 3/3] edit panel styles

---
 lms/static/sass/_discussion.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss
index 047d590d98..59609fd4ca 100644
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -778,6 +778,10 @@ $tag-text-color: #5b614f;
     }
   }
 
+  .discussion-content-edit {
+    margin: 3%;
+  }
+
   .new-post-form {
     margin: 10px 0 40px 0;
   }