Merge branch 'master' into group_flow_by_date

joeltaylor · joeltaylor · commit b647bf6ccf0c · 2015-06-03T22:12:39.000-04:00
diff --git a/client/stylesheets/components/_grid.sass b/client/stylesheets/components/_grid.sass
@@ -73,6 +73,10 @@
   #{$g-selector}g-b--#{$namespace}1of1
     width: 100%
 
+  @for $column from 1 to 5
+    #{$g-selector}g-b--#{$namespace}#{$column}of5
+      width: percentage($column / 5)
+
   @for $column from 1 to $g-columns
     @if $column != $g-columns
       #{$g-selector}g-b--#{$namespace}#{$column}of#{$g-columns}
diff --git a/routes/news.js b/routes/news.js
@@ -232,7 +232,9 @@ router.
         comment[0].isSpam = true;
         res.json({comment: comment[0]});
       }else{
-        res.redirect('/news/' + newComment.slug + '#comment-' + comment[0].id );
+        Comments.findByCommentId(comment[0].id, function(comment) {
+          res.json({comment: comment[0]});
+        });
       }
     });
   }).
