diff --git a/client/coral-admin/src/components/CommentType.css b/client/coral-admin/src/components/CommentType.css index e4851275e..969d9511d 100644 --- a/client/coral-admin/src/components/CommentType.css +++ b/client/coral-admin/src/components/CommentType.css @@ -3,12 +3,11 @@ color: white; background: grey; box-sizing: border-box; - padding: 0px 5px; - border-radius: 2px; + padding: 2px 5px; font-size: 12px; height: 24px; letter-spacing: 0.4px; - margin-bottom: 1px; + line-height: 22px; > i { font-size: 14px; diff --git a/client/coral-admin/src/routes/Moderation/components/ReplyBadge.js b/client/coral-admin/src/components/ReplyBadge.js similarity index 100% rename from client/coral-admin/src/routes/Moderation/components/ReplyBadge.js rename to client/coral-admin/src/components/ReplyBadge.js diff --git a/client/coral-admin/src/components/UserDetailComment.css b/client/coral-admin/src/components/UserDetailComment.css index b042aea39..2dfd61cf3 100644 --- a/client/coral-admin/src/components/UserDetailComment.css +++ b/client/coral-admin/src/components/UserDetailComment.css @@ -55,7 +55,7 @@ position: relative; } -.commentType { +.badgeBar { position: absolute; right: 0px; } diff --git a/client/coral-admin/src/components/UserDetailComment.js b/client/coral-admin/src/components/UserDetailComment.js index 9b4936847..3d92c0365 100644 --- a/client/coral-admin/src/components/UserDetailComment.js +++ b/client/coral-admin/src/components/UserDetailComment.js @@ -3,6 +3,7 @@ import {Link} from 'react-router'; import {Icon} from 'coral-ui'; import FlagBox from './FlagBox'; +import ReplyBadge from './ReplyBadge'; import styles from './UserDetailComment.css'; import CommentType from './CommentType'; import {getActionSummary} from 'coral-framework/utils'; @@ -56,7 +57,11 @@ class UserDetailComment extends React.Component { ?  ({t('comment.edited')}) : null } - + +
+ + +
Story: {comment.asset.title} diff --git a/client/coral-admin/src/containers/UserDetailComment.js b/client/coral-admin/src/containers/UserDetailComment.js index a70a9394d..9f0e3a793 100644 --- a/client/coral-admin/src/containers/UserDetailComment.js +++ b/client/coral-admin/src/containers/UserDetailComment.js @@ -9,6 +9,7 @@ export default withFragments({ body created_at status + hasParent asset { id title diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js index 2ca18d928..6980105c3 100644 --- a/client/coral-admin/src/routes/Moderation/components/Comment.js +++ b/client/coral-admin/src/routes/Moderation/components/Comment.js @@ -2,6 +2,7 @@ import React, {PropTypes} from 'react'; import {Link} from 'react-router'; import {Icon} from 'coral-ui'; +import ReplyBadge from 'coral-admin/src/components/ReplyBadge'; import FlagBox from 'coral-admin/src/components/FlagBox'; import styles from './styles.css'; import CommentType from 'coral-admin/src/components/CommentType'; @@ -15,7 +16,6 @@ import CommentBodyHighlighter from 'coral-admin/src/components/CommentBodyHighli import IfHasLink from 'coral-admin/src/components/IfHasLink'; import cn from 'classnames'; import {getCommentType} from 'coral-admin/src/utils/comment'; -import ReplyBadge from './ReplyBadge'; import t, {timeago} from 'coral-framework/services/i18n'; diff --git a/client/coral-ui/components/Badge.css b/client/coral-ui/components/Badge.css index fd725cf14..db68ebd58 100644 --- a/client/coral-ui/components/Badge.css +++ b/client/coral-ui/components/Badge.css @@ -1,14 +1,15 @@ .badge { display: inline-block; color: white; - background-color: #3D73D5; + background: grey; box-sizing: border-box; - padding: 0px 5px; + padding: 2px 5px; font-size: 12px; height: 24px; letter-spacing: 0.4px; - margin-bottom: 1px; - margin-right: 2px; + line-height: 22px; + background-color: #3D73D5; + margin-right: 4px; } .icon {