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

diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index a0d723940c9d0a136e40aa26df49676bd86f4343..1c45341d53d21016b3110b7ea66cf7a54d971cb8 100644 (file)
--- 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 6b9db5656d46781ccf7a6164430360d3704e73d1..0b3493b5028d2904b4fa3dc12ed1f89d4334432c 100644 (file)
--- 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,
           })}
         />