]> Untitled Git - lemmy-ui.git/commitdiff
Merge branch 'main' into fix/wider-max-width-1536
authorSleeplessOne1917 <abias1122@gmail.com>
Tue, 27 Jun 2023 00:29:13 +0000 (20:29 -0400)
committerGitHub <noreply@github.com>
Tue, 27 Jun 2023 00:29:13 +0000 (20:29 -0400)
1  2 
src/assets/css/main.css
src/shared/components/post/post-listing.tsx

diff --combined src/assets/css/main.css
index 43aad0c28ad63089f53aaaee8a249442901caa62,41ec231b873cb4c400811721d24aab50f931c433..63c1b47121defb9bd1a0fcb14a1c59839ff0aa8c
@@@ -198,9 -198,9 +198,9 @@@ blockquote 
  
  .thumbnail {
    object-fit: cover;
 -  min-height: 60px;
 -  max-height: 80px;
 +  aspect-ratio: 4/3;
    width: 100%;
 +  max-height: 6rem;
  }
  
  .thumbnail svg {
@@@ -360,8 -360,9 +360,9 @@@ br.big 
  }
  
  .img-icon {
-   width: 2rem;
-   height: 2rem;
+   width: calc(var(--bs-body-line-height) * 1em);
+   height: calc(var(--bs-body-line-height) * 1em);
+   border-radius: 0.25em;
  }
  
  .tribute-container ul {
index 7f0aaf5d720203c20d6bcd5b6a08f94ac3456d54,368dc438b20dcc1f2d20cb379eb9b2e3bdeecd33..d0d65bd7c66e56f1d1456302ea33ab812657005a
@@@ -396,7 -396,7 +396,7 @@@ export class PostListing extends Compon
      const post_view = this.postView;
      return (
        <span className="small">
-         <PersonListing person={post_view.creator} muted={true} />
+         <PersonListing person={post_view.creator} />
          {this.creatorIsMod_ && (
            <span className="mx-1 badge text-bg-light">
              {I18NextService.i18n.t("mod")}
          <div className="d-none d-sm-block">
            <article className="row post-container">
              {!this.props.viewOnly && (
 -              <VoteButtons
 -                voteContentType={VoteContentType.Post}
 -                id={this.postView.post.id}
 -                onVote={this.props.onPostVote}
 -                enableDownvotes={this.props.enableDownvotes}
 -                counts={this.postView.counts}
 -                my_vote={this.postView.my_vote}
 -              />
 +              <div className="col flex-grow-0">
 +                <VoteButtons
 +                  voteContentType={VoteContentType.Post}
 +                  id={this.postView.post.id}
 +                  onVote={this.props.onPostVote}
 +                  enableDownvotes={this.props.enableDownvotes}
 +                  counts={this.postView.counts}
 +                  my_vote={this.postView.my_vote}
 +                />
 +              </div>
              )}
 -            <div className="col-sm-2 pe-0 post-media">
 -              <div className="">{this.thumbnail()}</div>
 -            </div>
 -            <div className="col-12 col-sm-9">
 +            <div className="col flex-grow-1">
                <div className="row">
 -                <div className="col-12">
 +                <div className="col-sm-3 col-lg-2 pe-0 post-media">
 +                  <div className="">{this.thumbnail()}</div>
 +                </div>
 +                <div className="col-12 col-sm-9 col-lg-10">
                    {this.postTitleLine()}
                    {this.createdLine()}
                    {this.showBodyPreview()}