Merge branch 'main' into fix/1417-communities-search-layout

src/shared/components/common/language-select.tsx

@@ -66,10 +66,9 @@ export class LanguageSelect extends Component<LanguageSelectProps, any> {
             {i18n.t(this.props.multiple ? "language_plural" : "language")}
           </label>
           <div
-            className={classNames(
+            className={classNames(`col-sm-${this.props.multiple ? 9 : 10}`, {
-              "input-group",
+              "input-group": this.props.multiple,
-              `col-sm-${this.props.multiple ? 9 : 10}`
+            })}
-            )}
           >
             {this.selectBtn}
             {this.props.multiple && (

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

@@ -178,7 +178,7 @@ export class CreatePost extends Component<
               id="createPostForm"
               className="col-12 col-lg-6 offset-lg-3 mb-4"
             >
-              <h5>{i18n.t("create_post")}</h5>
+              <h1 className="h4">{i18n.t("create_post")}</h1>
               <PostForm
                 onCreate={this.handlePostCreate}
                 params={locationState}

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

@@ -487,6 +487,13 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
             />
           </div>
         </div>
+        <LanguageSelect
+          allLanguages={this.props.allLanguages}
+          siteLanguages={this.props.siteLanguages}
+          selectedLanguageIds={selectedLangs}
+          multiple={false}
+          onChange={this.handleLanguageChange}
+        />
         {!this.props.post_view && (
           <div className="mb-3 row">
             <label className="col-sm-2 col-form-label" htmlFor="post-community">
@@ -511,30 +518,17 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
           </div>
         )}
         {this.props.enableNsfw && (
-          <div className="mb-3 row">
+          <div className="form-check mb-3">
-            <legend className="col-form-label col-sm-2 pt-0">
-              {i18n.t("nsfw")}
-            </legend>
-            <div className="col-sm-10">
-              <div className="form-check">
             <input
-                  className="form-check-input position-static"
+              className="form-check-input"
               id="post-nsfw"
               type="checkbox"
               checked={this.state.form.nsfw}
               onChange={linkEvent(this, handlePostNsfwChange)}
             />
-              </div>
+            <label className="form-check-label">{i18n.t("nsfw")}</label>
-            </div>
           </div>
         )}
-        <LanguageSelect
-          allLanguages={this.props.allLanguages}
-          siteLanguages={this.props.siteLanguages}
-          selectedLanguageIds={selectedLangs}
-          multiple={false}
-          onChange={this.handleLanguageChange}
-        />
         <input
           tabIndex={-1}
           autoComplete="false"