From: SleeplessOne1917 <abias1122@gmail.com>
Date: Mon, 12 Jun 2023 21:12:49 +0000 (+0000)
Subject: Merge branch 'main' into avatar-aspect-ratio-fix
X-Git-Url: http://these/git/?a=commitdiff_plain;h=800c1655fefe8e172bf3d7f7f1de48829ae2e9cd;hp=a605c728597190879c0730896a0c584050b89188;p=lemmy-ui.git

Merge branch 'main' into avatar-aspect-ratio-fix
---

diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index a0d7239..1c45341 100644
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -270,6 +270,10 @@ hr {
   -ms-filter: blur(10px);
 }
 
+.img-cover {
+  object-fit: cover;
+}
+
 .img-expanded {
   max-height: 90vh;
 }
diff --git a/src/shared/components/common/pictrs-image.tsx b/src/shared/components/common/pictrs-image.tsx
index 6b9db56..0b3493b 100644
--- a/src/shared/components/common/pictrs-image.tsx
+++ b/src/shared/components/common/pictrs-image.tsx
@@ -38,8 +38,9 @@ export class PictrsImage extends Component<PictrsImageProps, any> {
             "img-expanded slight-radius":
               !this.props.thumbnail && !this.props.icon,
             "img-blur": this.props.thumbnail && this.props.nsfw,
-            "rounded-circle img-icon mr-2": this.props.icon,
-            "ml-2 mb-0 rounded-circle avatar-overlay": this.props.iconOverlay,
+            "rounded-circle img-cover img-icon mr-2": this.props.icon,
+            "ml-2 mb-0 rounded-circle img-cover avatar-overlay":
+              this.props.iconOverlay,
             "avatar-pushup": this.props.pushup,
           })}
         />