Merge branch 'master' into my-comments-ux

client/coral-embed-stream/src/Comment.css

@@ -1,9 +1,10 @@
 .Reply {
   position: relative;
+  margin-bottom: 15px;
 }
 
 .Comment {
-
+  margin-bottom: 15px;
 }
 
 .pendingComment {

client/coral-embed-stream/src/LoadMore.js

@@ -44,14 +44,15 @@ class LoadMore extends React.Component {
   render () {
     const {assetId, comments, loadMore, moreComments, parentId, replyCount, topLevel} = this.props;
     return moreComments
-      ? <Button
-        className='coral-load-more'
-        onClick={() => {
-          this.initialState = false;
-          loadMoreComments(assetId, comments, loadMore, parentId);
-        }}>
-        {topLevel ? lang.t('viewMoreComments') : this.replyCountFormat(replyCount)}
-      </Button>
+      ? <div className='coral-load-more'>
+        <Button
+          onClick={() => {
+            this.initialState = false;
+            loadMoreComments(assetId, comments, loadMore, parentId);
+          }}>
+          {topLevel ? lang.t('viewMoreComments') : this.replyCountFormat(replyCount)}
+        </Button>
+      </div>
       : null;
   }
 }

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

@@ -212,6 +212,7 @@ hr {
 
 .coral-plugin-commentcontent-text {
   margin-bottom: 7px;
+  font-size: 16px;
 }
 
 .coral-plugin-author-name-text {
@@ -417,8 +418,11 @@ button.comment__action-button[disabled],
 
 /* Load More */
 
-button.coral-load-more {
-  width: 100%;
+.coral-load-more {
+  text-align: center;
+}
+
+.coral-load-more button {
   text-align: center;
   color: #FFF;
   background-color: #2376D8;
@@ -427,9 +431,10 @@ button.coral-load-more {
   border-radius: 2px;
   line-height: 1em;
   text-transform: capitalize;
+  display: inline-block;
 }
 
-button.coral-load-more:hover {
+.coral-load-more:hover button {
   background-color: #4399FF;
 }
 

client/coral-framework/translations.json

@@ -16,7 +16,7 @@
     "viewReply": "view reply",
     "viewAllRepliesInitial": "view all {0} replies",
     "viewAllReplies": "view {0} replies",
-    "newCount": "View {0} more {1}",
+    "newCount": "View {0} new {1}",
     "comment": "comment",
     "comments": "comments",
     "error": {
@@ -48,7 +48,7 @@
     "contentNotAvailable": "El contenido no se encuentra disponible",
     "bannedAccountMsg": "Tu cuenta se encuentra suspendida. Esto significa que no puedes dar Like, Marcar o escribir commentarios.",
     "editNameMsg": "",
-    "viewMoreComments": "Var commentarios más",
+    "viewMoreComments": "Ver commentarios más",
     "viewReply": "ver respuesta",
     "viewAllRepliesInitial": "ver todas las {0} respuestas",
     "viewAllReplies": "ver {0} respuestas",