diff --git a/src/views/preview/comment/comment.scss b/src/views/preview/comment/comment.scss index 324df51c1..d367cc0b8 100644 --- a/src/views/preview/comment/comment.scss +++ b/src/views/preview/comment/comment.scss @@ -1,5 +1,10 @@ @import "../../../colors"; +.compose-row { + margin-top: 30px; + margin-bottom: 40px; +} + .compose-comment { margin-left: .5rem; width: 100%; diff --git a/src/views/preview/comment/compose-comment.jsx b/src/views/preview/comment/compose-comment.jsx index ebe19e789..374ec55ad 100644 --- a/src/views/preview/comment/compose-comment.jsx +++ b/src/views/preview/comment/compose-comment.jsx @@ -330,7 +330,7 @@ class ComposeComment extends React.Component { className={classNames('flex-row', 'comment', this.state.status === ComposeStatus.REJECTED_MUTE ? - 'compose-disabled' : '')} + 'compose-disabled' : 'compose-row')} > diff --git a/src/views/studio/icons/edit-icon.svg b/src/views/studio/icons/edit-icon.svg index 74d899763..376c4c01d 100644 --- a/src/views/studio/icons/edit-icon.svg +++ b/src/views/studio/icons/edit-icon.svg @@ -1,3 +1,3 @@ - + diff --git a/src/views/studio/l10n.json b/src/views/studio/l10n.json index a01c7b55e..a406fec27 100644 --- a/src/views/studio/l10n.json +++ b/src/views/studio/l10n.json @@ -63,6 +63,7 @@ "studio.promote": "Promote", "studio.commentsHeader": "Comments", + "studio.commentsNotAllowed": "Commenting for this studio has been turned off.", "studio.comments.toggleOff": "Commenting off", "studio.comments.toggleOn": "Commenting on", "studio.comments.turnedOff": "Sorry, comment posting has been turned off for this studio.", diff --git a/src/views/studio/studio-comments-not-allowed.jsx b/src/views/studio/studio-comments-not-allowed.jsx new file mode 100644 index 000000000..15f5d5cf5 --- /dev/null +++ b/src/views/studio/studio-comments-not-allowed.jsx @@ -0,0 +1,10 @@ +const React = require('react'); +const FormattedMessage = require('react-intl').FormattedMessage; + +const StudioCommentsNotAllowed = () => ( +
+ +
+); + +module.exports = StudioCommentsNotAllowed; diff --git a/src/views/studio/studio-comments.jsx b/src/views/studio/studio-comments.jsx index b477f0d94..a4795c340 100644 --- a/src/views/studio/studio-comments.jsx +++ b/src/views/studio/studio-comments.jsx @@ -8,6 +8,7 @@ import ComposeComment from '../preview/comment/compose-comment.jsx'; import TopLevelComment from '../preview/comment/top-level-comment.jsx'; import studioCommentActions from '../../redux/studio-comment-actions.js'; import StudioCommentsAllowed from './studio-comments-allowed.jsx'; +import StudioCommentsNotAllowed from './studio-comments-not-allowed.jsx'; import {selectIsAdmin, selectHasFetchedSession} from '../../redux/session'; import { @@ -56,17 +57,20 @@ const StudioComments = ({ }, [isAdmin]); return ( -
+

{canEditCommentsAllowed && }
-
- {shouldShowCommentComposer && commentsAllowed && - +
+ {shouldShowCommentComposer ? + (commentsAllowed ? + : + + ) : null } {comments.map(comment => (