Merge branch 'master' into comment-context-label

client/coral-embed-stream/style/default.css

@@ -257,6 +257,8 @@ body {
   margin: 0px 5px;
   padding: 5px 5px;
   border-radius: 2px;
+  font-size: 12px;
+  font-weight: bold;
 }
 
 /* Comment Action Styles */

client/talk-plugin-flags/components/FlagButton.js

@@ -91,7 +91,7 @@ export default class FlagButton extends Component {
         reason: null,
         message
       };
-      if (reason === 'I don\'t agree with this comment') {
+      if (reason === 'COMMENT_NOAGREE') {
         postDontAgree(action)
         .then(({data}) => {
           if (itemType === 'COMMENTS') {