Merge branch 'discussion2' of github.com:dementrock/mitx

lms/static/sass/_discussion.scss

@@ -114,18 +114,30 @@ $discussion_input_width: 100%;
     .discussion-title {
       display: inline-block;
     }
-    &:hover {
-      .discussion-watch-discussion, .discussion-unwatch-discussion {
-        display: inline-block;
-      }
-    }
   }
   .follow-wrapper {
     float: right;
-    margin-top: -1.5%;
     .discussion-link {
-      display: inline;
+      display: inline-block;
+      @include button;
+      text-decoration: none;
       font-size: $comment_info_size;
+      padding: 5px 8px;
+      text-decoration: none;
+      border: 1px solid #6F6F6F;
+      -webkit-box-shadow: none; 
+      -moz-box-shadow: none; 
+      box-shadow: none; 
+      background-color: #959595;
+      background-image: none;
+      text-shadow: none;
+      &:hover {
+        -webkit-box-shadow: none; 
+        -moz-box-shadow: none; 
+        box-shadow: none; 
+        background-color: #888;
+        background-image: none; 
+      }
     }
   }
   .discussion-votes {
@@ -288,11 +300,6 @@ $discussion_input_width: 100%;
       }
       
     }
-    .discussion-content:hover {
-      .discussion-link {
-        display: inline-block;
-      }
-    }
     .discussion-content {
       overflow: hidden;
       border-top: lightgray 1px solid;