Merge branch 'next' into perm-fix

client/coral-ui/components/Drawer.css

@@ -37,6 +37,12 @@
   text-align: center;
   cursor: pointer;
 
+  .icon {
+    color: #595959;
+    font-size: 25px;
+    display: block;
+  }
+
   &:hover {
     color: #ccc;
   }

client/coral-ui/components/Drawer.js

@@ -2,11 +2,14 @@ import React from 'react';
 import cn from 'classnames';
 import PropTypes from 'prop-types';
 import styles from './Drawer.css';
+import {Icon} from 'coral-ui';
 
 const Drawer = ({children, onClose, className = ''}) => {
   return (
     <div className={cn(styles.drawer, className)}>
-      <button className={cn(styles.closeButton, [className, 'close-button'].join('-'))} onClick={onClose}>×</button>
+      <button className={cn(styles.closeButton, [className, 'close-button'].join('-'))} onClick={onClose}>
+        <Icon name="close" className={styles.icon} />
+      </button>
       <div className={styles.content}>
         {children}
       </div>

locales/en.yml

@@ -10,7 +10,7 @@ en:
     cancel: "Cancel"
     note: "Note: {0}"
     note_reject_comment: "Banning this user will also place this comment in the Rejected queue."
-    note_ban_user: "Banning this user will not let them edit comment or remove anything."
+    note_ban_user: "Banning this user will not let them comment, react to, or report comments."
     yes_ban_user: "Yes, Ban User"
     write_a_message: "Write a message"
     send: "Send"

plugins/talk-plugin-featured-comments/client/components/ModTag.css

@@ -7,11 +7,11 @@
   padding: 0px 5px;
   border-radius: 2px;
   font-size: 12px;
-  height: 24px;
+  height: 26px;
   transition: background-color .2s cubic-bezier(.4,0,.2,1), color .2s cubic-bezier(.4,0,.2,1), border-color .2s cubic-bezier(.4,0,.2,1);
   margin: 2px 0px;
   letter-spacing: 0.4px;
-
+  line-height: 25px;
 }
 
 .tag:hover {
@@ -38,5 +38,5 @@
 .tagIcon {
   margin-right: 5px;
   font-size: 15px;
-  vertical-align: text-bottom;
+  vertical-align: sub;
 }

plugins/talk-plugin-ignore-user/client/components/IgnoreUserConfirmation.css

@@ -16,6 +16,7 @@
   padding: 0;
   margin: 0 0 8px 0;
   font-size: 15px;
+  word-wrap: break-word;
 }
 
 .button {