From b7d6d77464c5bb170d84eb442dce55e4215dc180 Mon Sep 17 00:00:00 2001
From: marco <marcotuts@gmail.com>
Date: Mon, 29 Jul 2013 17:49:34 -0400
Subject: [PATCH] visual cleanup for email icon and discussion context label
 post branch merge

---
 lms/static/sass/_discussion.scss                    | 1 -
 lms/templates/discussion/_underscore_templates.html | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss
index 8d96e656fb..9cb6708b8f 100644
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -825,7 +825,6 @@ body.discussion {
       z-index: 50;
       display: block;
       overflow: hidden;
-      padding-top: 10%;
       width: 100%;
       height: 100%;
       border: 1px solid transparent;
diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html
index cd0e94e646..daf69d310d 100644
--- a/lms/templates/discussion/_underscore_templates.html
+++ b/lms/templates/discussion/_underscore_templates.html
@@ -212,8 +212,8 @@
   <tr class="helpgrid-row helpgrid-row-notification">
   <td class="row-title">Receive updates</td>
   <td class="row-item-full" colspan="3">
+  <input type="checkbox" class="email-setting" name="email-notification"></input>
   <i class="icon icon-envelope"></i>
-  <span class="row-setting"><input type="checkbox" class = "email-notification" name="email-notification"></input></span>
   <span class="row-description"> If enabled, you will receive an email digest once a day notifying you about new, unread activity from posts you are following. </span>
   </td>
   </tr>