LemmyNet/lemmy-ui
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy-ui.git synced 2024-11-26 14:21:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into feat/hide-avatars-on-listings

Browse source
This commit is contained in:
Jay Sitter 2023-06-26 08:50:41 -04:00 committed by GitHub
commit c04ce03cf4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/shared/components/comment/comment-nodes.tsx
View file

@ -79,7 +79,7 @@ export class CommentNodes extends Component<CommentNodesProps, any> {
const maxComments = this.props.maxCommentsShown ?? this.props.nodes.length;
const borderColor = this.props.depth
? colorList[this.props.depth % colorList.length]
? colorList[(this.props.depth - 1) % colorList.length]
: colorList[0];
return (
@ -89,7 +89,11 @@ export class CommentNodes extends Component<CommentNodesProps, any> {
"ms-1": !!this.props.isChild,
"border-top border-light": !this.props.noBorder,
})}
style={`border-left: 2px solid ${borderColor} !important;`}
style={
this.props.isChild
? `border-left: 2px solid ${borderColor} !important;`
: undefined
}
>
{this.props.nodes.slice(0, maxComments).map(node => (
<CommentNode

2
src/shared/components/post/post-form.tsx
View file

@ -531,7 +531,7 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
checked={this.state.form.nsfw}
onChange={linkEvent(this, handlePostNsfwChange)}
/>
<label className="form-check-label">
<label className="form-check-label" htmlFor="post-nsfw">
{I18NextService.i18n.t("nsfw")}
</label>
</div>