Merge branch 'main' into fix-nsfw-blur-spill

diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index 1c45341d53d21016b3110b7ea66cf7a54d971cb8..a150522cc8985947b009def19334037e0381e299 100644 (file)
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -434,3 +434,6 @@ br.big {
 em-emoji-picker {
   width: 100%;
 }
+.overflow-hidden {
+  overflow: hidden;
+}

diff --git a/src/shared/components/common/pictrs-image.tsx b/src/shared/components/common/pictrs-image.tsx
index 27d1cc5fcf79cbd5e6b1bfe451a3df020dec7aac..f975e4ace77e34b14a40607699b9454b36a0ea4f 100644 (file)
--- a/src/shared/components/common/pictrs-image.tsx
+++ b/src/shared/components/common/pictrs-image.tsx
@@ -22,7 +22,7 @@ export class PictrsImage extends Component<PictrsImageProps, any> {
 
   render() {
     return (
-      <picture>
+      <picture className="d-inline-block overflow-hidden">
         <source srcSet={this.src("webp")} type="image/webp" />
         <source srcSet={this.props.src} />
         <source srcSet={this.src("jpg")} type="image/jpeg" />