Merge remote-tracking branch 'origin/master' into imprv/apply-unstated

src/client/js/components/PageComment/Comment.jsx

@@ -144,13 +144,11 @@ class Comment extends React.Component {
 
     const areThereHiddenReplies = replyList.length > 2;
 
-    const iconForOlder = (this.state.isLayoutTypeGrowi)
-      ? <i className="fa fa-angle-double-up"></i>
-      : <i className="fa fa-angle-double-down"></i>;
-    const toggleOlder = (areThereHiddenReplies)
+    const iconForOlder = <i className="icon-options-vertical"></i>;
+    const toggleOlder = areThereHiddenReplies
       ? (
         <a className="page-comments-list-toggle-older text-center" data-toggle="collapse" href="#page-comments-list-older">
-          {iconForOlder} Show Older Replies {iconForOlder}
+          {iconForOlder} Read More
         </a>
       )
       : <div></div>;

src/client/styles/scss/_comment.scss

@@ -28,7 +28,6 @@
       display: block;
       margin: 8px;
       font-size: 0.9em;
-      color: #999;
       text-align: center;
     }