mirror of
https://github.com/LemmyNet/lemmy-ui.git
synced 2024-11-09 18:05:09 +00:00
Merge branch 'main' into fix/wider-max-width-1536
This commit is contained in:
commit
7999dd1ba8
|
@ -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
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in a new issue