scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 01:25:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'develop' into hotfix/proxy-love-favorite

Browse source
This commit is contained in:
Benjamin Wheeler 2019-01-07 14:20:28 -05:00 committed by GitHub
commit 63cc104668
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/l10n.json
View file

@ -88,7 +88,7 @@
"general.copyLink": "Copy Link", "general.copyLink": "Copy Link",
"general.report": "Report", "general.report": "Report",
"general.notAvailableHeadline": "Whoops! Our server is Scratch'ing its head", "general.notAvailableHeadline": "Whoops! Our server is Scratch'ing its head",
"general.notAvailableSubtitle": "We couldn't find the page you're looking for. Check to make sure you've typed the url correctly.", "general.notAvailableSubtitle": "We couldn't find the page you're looking for. Check to make sure you've typed the URL correctly.",
"general.seeAllComments": "See all comments", "general.seeAllComments": "See all comments",
"general.all": "All", "general.all": "All",

10
src/views/preview/presentation.jsx
View file

@ -379,8 +379,7 @@ const PreviewPresentation = ({
}) })
}} }}
validations={{ validations={{
// TODO: actual 5000 maxLength: 5000
maxLength: 1000
}} }}
value={projectInfo.instructions} value={projectInfo.instructions}
/> />
@ -423,8 +422,7 @@ const PreviewPresentation = ({
}) })
}} }}
validations={{ validations={{
// TODO: actual 5000 maxLength: 5000
maxLength: 1000
}} }}
value={projectInfo.description} value={projectInfo.description}
/> />
@ -522,7 +520,7 @@ const PreviewPresentation = ({
<FlexRow className="comments-root-reply"> <FlexRow className="comments-root-reply">
{projectInfo.comments_allowed ? ( {projectInfo.comments_allowed ? (
isLoggedIn ? ( isLoggedIn ? (
<ComposeComment isShared && <ComposeComment
projectId={projectId} projectId={projectId}
onAddComment={onAddComment} onAddComment={onAddComment}
/> />
@ -543,7 +541,7 @@ const PreviewPresentation = ({
<TopLevelComment <TopLevelComment
author={comment.author} author={comment.author}
canDelete={canDeleteComments} canDelete={canDeleteComments}
canReply={isLoggedIn && projectInfo.comments_allowed} canReply={isLoggedIn && projectInfo.comments_allowed && isShared}
canReport={isLoggedIn} canReport={isLoggedIn}
canRestore={canRestoreComments} canRestore={canRestoreComments}
content={comment.content} content={comment.content}

3
src/views/preview/preview.scss
View file

@ -470,7 +470,8 @@ $stage-width: 480px;
&.has-error { &.has-error {
.validation-message { .validation-message {
transform: translate(26rem, 0); top: 100%;
right: 0;
} }
} }