LemmyNet/lemmy-ui
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy-ui.git synced 2025-02-10 19:14:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into feat/move-advanced-post-menu-into-dropdown

Browse source
This commit is contained in:
SleeplessOne1917 2023-06-18 13:58:51 +00:00 committed by GitHub
commit 0668a52daa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 100 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/shared/components/home/signup.tsx
View file

@ -298,7 +298,6 @@ export class Signup extends Component<any, State> {
</> </>
)} )}
{this.renderCaptcha()} {this.renderCaptcha()}
{siteView.local_site.enable_nsfw && (
<div className="form-group row"> <div className="form-group row">
<div className="col-sm-10"> <div className="col-sm-10">
<div className="form-check"> <div className="form-check">
@ -309,16 +308,12 @@ export class Signup extends Component<any, State> {
checked={this.state.form.show_nsfw} checked={this.state.form.show_nsfw}
onChange={linkEvent(this, this.handleRegisterShowNsfwChange)} onChange={linkEvent(this, this.handleRegisterShowNsfwChange)}
/> />
<label <label className="form-check-label" htmlFor="register-show-nsfw">
className="form-check-label"
htmlFor="register-show-nsfw"
>
{i18n.t("show_nsfw")} {i18n.t("show_nsfw")}
</label> </label>
</div> </div>
</div> </div>
</div> </div>
)}
<input <input
tabIndex={-1} tabIndex={-1}
autoComplete="false" autoComplete="false"

3
src/shared/components/person/settings.tsx
View file

@ -21,7 +21,6 @@ import {
debounce, debounce,
elementUrl, elementUrl,
emDash, emDash,
enableNsfw,
fetchCommunities, fetchCommunities,
fetchThemeList, fetchThemeList,
fetchUsers, fetchUsers,
@ -642,7 +641,6 @@ export class Settings extends Component<any, SettingsState> {
/> />
</div> </div>
</form> </form>
{enableNsfw(this.state.siteRes) && (
<div className="form-group"> <div className="form-group">
<div className="form-check"> <div className="form-check">
<input <input
@ -657,7 +655,6 @@ export class Settings extends Component<any, SettingsState> {
</label> </label>
</div> </div>
</div> </div>
)}
<div className="form-group"> <div className="form-group">
<div className="form-check"> <div className="form-check">
<input <input

26
src/shared/components/post/post-listing.tsx
View file

@ -497,7 +497,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
const post = this.postView.post; const post = this.postView.post;
return ( return (
<Link <Link
className={`d-inline-block ${ className={`d-inline ${
!post.featured_community && !post.featured_local !post.featured_community && !post.featured_local
? "text-body" ? "text-body"
: "text-primary" : "text-primary"
@ -505,8 +505,8 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
to={`/post/${post.id}`} to={`/post/${post.id}`}
title={i18n.t("comments")} title={i18n.t("comments")}
> >
<div <span
className="d-inline-block" className="d-inline"
dangerouslySetInnerHTML={mdToHtmlInline(post.name)} dangerouslySetInnerHTML={mdToHtmlInline(post.name)}
/> />
</Link> </Link>
@ -519,30 +519,23 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
return ( return (
<div className="post-title overflow-hidden"> <div className="post-title overflow-hidden">
<h5> <h5 className="d-inline">
{url ? ( {url && this.props.showBody ? (
this.props.showBody ? (
<a <a
className={`d-inline-block ${ className={
!post.featured_community && !post.featured_local !post.featured_community && !post.featured_local
? "text-body" ? "text-body"
: "text-primary" : "text-primary"
}`} }
href={url} href={url}
title={url} title={url}
rel={relTags} rel={relTags}
>
<div
className="d-inline-block"
dangerouslySetInnerHTML={mdToHtmlInline(post.name)} dangerouslySetInnerHTML={mdToHtmlInline(post.name)}
/> ></a>
</a>
) : (
this.postLink
)
) : ( ) : (
this.postLink this.postLink
)} )}
</h5>
{(url && isImage(url)) || {(url && isImage(url)) ||
(post.thumbnail_url && ( (post.thumbnail_url && (
<button <button
@ -600,7 +593,6 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
{i18n.t("nsfw")} {i18n.t("nsfw")}
</small> </small>
)} )}
</h5>
</div> </div>
); );
} }