scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-30 02:56:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #2965 from benjiwheeler/admin-markedbyfilter

Browse source 
for admins, handle markedbyfilter comments differently, color them ye…
This commit is contained in:
Benjamin Wheeler 2019-05-14 20:10:54 -04:00 committed by GitHub
commit 4ec21913dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/views/preview/comment/comment.jsx
View file

@ -111,7 +111,10 @@ class Comment extends React.Component {
visibility visibility
} = this.props; } = this.props;
const visible = visibility === 'visible'; // we allow comments that are fully visible, or markedByFilter (flagged by
// our bad words filter, but not at the critical level of offensiveness)
const markedByFilter = visibility === 'markedbyfilter';
const visible = markedByFilter || visibility === 'visible';
let commentText = content; let commentText = content;
if (replyUsername) { if (replyUsername) {
@ -182,6 +185,7 @@ class Comment extends React.Component {
<div <div
className={classNames({ className={classNames({
'comment-bubble': true, 'comment-bubble': true,
'comment-bubble-markedbyfilter': markedByFilter,
'comment-bubble-reported': !visible 'comment-bubble-reported': !visible
})} })}
> >

13
src/views/preview/comment/comment.scss
View file

@ -197,6 +197,19 @@
background: $reported-background; background: $reported-background;
} }
} }
&.comment-bubble-markedbyfilter {
$markedbyfilter-outline: $ui-yellow;
$markedbyfilter-background: rgb(255, 254, 210);
border-color: $markedbyfilter-outline;
background-color: $markedbyfilter-background;
&:before {
border-color: $markedbyfilter-outline transparent $markedbyfilter-outline $markedbyfilter-outline;
background: $markedbyfilter-background;
}
}
} }
.comment-content { .comment-content {