From: Jay Sitter <jay@jaysitter.com>
Date: Mon, 26 Jun 2023 22:24:31 +0000 (-0400)
Subject: Merge remote-tracking branch 'lemmy/main' into fix/wider-max-width-1536
X-Git-Url: http://these/git/ui/assets/static/%7Bthis.state.url%7D?a=commitdiff_plain;h=d62424d491cd799794fbfc2cdbbc907a2bcd56b5;p=lemmy-ui.git

Merge remote-tracking branch 'lemmy/main' into fix/wider-max-width-1536

* lemmy/main:
  fix vote button alignment
  Fix feedback on banning an unbanning
  remove icon (#1618)
  Indicate valid and invalid fields in signup form (#1450)
  capitalize button (#1616)
  Move password reset form to separate route, view (#1390)
  feat(UI): Reduce base font size (#1591)
  Fix: missing semantic css classes and html elements (#1583)
---

d62424d491cd799794fbfc2cdbbc907a2bcd56b5
diff --cc src/assets/css/themes/_variables.scss
index 1418597,5b07cf5..47a01ce
--- a/src/assets/css/themes/_variables.scss
+++ b/src/assets/css/themes/_variables.scss
@@@ -1,2 -1,7 +1,3 @@@
  $link-decoration: none;
  $min-contrast-ratio: 3;
+ $font-size-base: 0.875rem;
 -
 -$container-max-widths: (
 -  lg: 1140px,
 -);
diff --cc src/shared/components/community/community.tsx
index 191f8ae,a18153f..879db3e
--- a/src/shared/components/community/community.tsx
+++ b/src/shared/components/community/community.tsx
@@@ -317,7 -317,7 +317,10 @@@ export class Community extends Componen
              />
  
              <div className="row">
-               <div className="col-12 col-md-8 col-lg-9">
 -              <main className="col-12 col-md-8" ref={this.mainContentRef}>
++              <main
++                className="col-12 col-md-8 col-lg-9"
++                ref={this.mainContentRef}
++              >
                  {this.communityInfo(res)}
                  <div className="d-block d-md-none">
                    <button
@@@ -339,10 -339,10 +342,10 @@@
                  {this.selects(res)}
                  {this.listings(res)}
                  <Paginator page={page} onChange={this.handlePageChange} />
-               </div>
-               <div className="d-none d-md-block col-md-4 col-lg-3">
+               </main>
 -              <aside className="d-none d-md-block col-md-4">
++              <aside className="d-none d-md-block col-md-4 col-lg-3">
                  {this.sidebar(res)}
-               </div>
+               </aside>
              </div>
            </>
          );
diff --cc src/shared/components/post/post.tsx
index fe7897f,1aaf50d..3c0015e
--- a/src/shared/components/post/post.tsx
+++ b/src/shared/components/post/post.tsx
@@@ -348,7 -348,7 +348,7 @@@ export class Post extends Component<any
          const res = this.state.postRes.data;
          return (
            <div className="row">
-             <div className="col-12 col-md-8 col-lg-9 mb-3">
 -            <main className="col-12 col-md-8 mb-3">
++            <main className="col-12 col-md-8 col-lg-9 mb-3">
                <HtmlTags
                  title={this.documentTitle}
                  path={this.context.router.route.match.url}
@@@ -415,10 -415,10 +415,10 @@@
                  this.commentsTree()}
                {this.state.commentViewType == CommentViewType.Flat &&
                  this.commentsFlat()}
-             </div>
-             <div className="d-none d-md-block col-md-4 col-lg-3">
+             </main>
 -            <aside className="d-none d-md-block col-md-4">
++            <aside className="d-none d-md-block col-md-4 col-lg-3">
                {this.sidebar()}
-             </div>
+             </aside>
            </div>
          );
        }