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

src/shared/components/home/signup.tsx

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

src/shared/components/person/settings.tsx

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

src/shared/components/post/post-listing.tsx

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