]> Untitled Git - lemmy-ui.git/commitdiff
Merge remote-tracking branch 'lemmy/main' into fix/wider-max-width-1536
authorJay Sitter <jay@jaysitter.com>
Mon, 26 Jun 2023 22:24:31 +0000 (18:24 -0400)
committerJay Sitter <jay@jaysitter.com>
Mon, 26 Jun 2023 22:24:31 +0000 (18:24 -0400)
* 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)

1  2 
src/assets/css/themes/_variables.scss
src/assets/css/themes/darkly-red.css
src/assets/css/themes/darkly.css
src/assets/css/themes/litely-red.css
src/assets/css/themes/litely.css
src/shared/components/common/vote-buttons.tsx
src/shared/components/community/community.tsx
src/shared/components/post/post-listing.tsx
src/shared/components/post/post.tsx

index 1418597a4a9cf496d9db95108c1c829a5586e71d,5b07cf528aee441b7e93aa2a806b3cbc41d59b8b..47a01ce03691040b5f959a49f242c6b53770c035
@@@ -1,2 -1,7 +1,3 @@@
  $link-decoration: none;
  $min-contrast-ratio: 3;
 -
 -$container-max-widths: (
 -  lg: 1140px,
 -);
+ $font-size-base: 0.875rem;
Simple merge
Simple merge
Simple merge
Simple merge
index 191f8ae3b18bc1f4f78d7088ac9bea62efff7010,a18153f52c21b4d76c393aba9b2b232ad58512d8..879db3e3920d0d36853f0a12a01b66b460286bb0
@@@ -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
                  {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>
            </>
          );
index fe7897ff163a1c2861a037125fcc579f3da4b2c2,1aaf50d525cac698caf49b51c0f70d7400e03a54..3c0015ec290c2a52b324b0c0efa44371b7f7e5b3
@@@ -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}
                  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>
          );
        }