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

lms/static/sass/_discussion.scss

@@ -25,11 +25,18 @@ form label {
 }
 
 div.recent-activity {
-  font-size: $comment_body_size;
-  margin: 4%;
-  font-weight: bold;
+  margin: 20% 4%;
+  
+  div.recent-activity-title {
+    font-weight: bold;
+  }
+  
   a.recent-active-post {
-    margin-bottom: 2px;
+    display: block;
+    font-size: $comment_body_size;
+    line-height: 120%;
+    margin-top: 8px;
+
     &:hover {
       color: #1C71DD;
       text-decoration: none;
@@ -38,6 +45,36 @@ div.recent-activity {
   }
 }
 
+div.trending-tags {
+  font-weight: bold;
+  margin: 15% 0 0 0;
+  
+  .trending-tag {
+    margin-top: 5px;
+  }
+  
+  .trending-tag-link {
+    @include discussion-font;
+    background: #CDE69C;
+    border: 1px solid #A5D24A;
+    -moz-border-radius: 2px;
+    -webkit-border-radius: 2px;
+    color: #638421;
+    display: block;
+    float: left;
+    font-size: 13px;
+    margin-right: 4px;
+    padding: 5px 7px;
+    text-decoration: none;
+        
+    &:hover {
+      border-color: #1E4612;
+      color: #1E4612;
+      text-decoration: none;
+    }
+  }
+}
+
 .discussion {
   
   .discussion-non-content {

lms/templates/discussion/_recent_active_posts.html

@@ -1,5 +1,6 @@
 <div class="recent-activity">
-  Recent Activity:
+  
+  <div class="recent-activity-title">Recent Activity:</div>
 
 <div class="recent-active-posts">
   % for thread in recent_active_threads:

lms/templates/discussion/_trending_tags.html

@@ -1,6 +1,6 @@
+<div class="trending-tags">
 Trending tags:
 
-<div class="trending-tags">
   % for tag, count in trending_tags:
     <div class="trending-tag">
       <a class="trending-tag-link" href="javascript:void(0)">${tag}</a>