Merge branch 'main' into Comments-button

Author: iFlameing

frontend/packages/kitconcept-intranet/news/+fixImageGalleryHeightConflict.bugfix

@@ -0,0 +1 @@
+Fix tailwind conflict with content-upload img. @tishasoumya-02

frontend/packages/kitconcept-intranet/src/theme/_main.scss

@@ -8,6 +8,7 @@
 @import 'components/personPill.scss';
 @import 'components/slateDate.scss';
 @import 'components/listingDisclaimer';
+@import 'components/imageGallery';
 @import '_content.scss';
 @import 'reviewSidebar.scss';
 @import 'header.scss';

frontend/packages/kitconcept-intranet/src/theme/components/_imageGallery.scss

@@ -0,0 +1,6 @@
+// Needed to fix conflict with tailwind css
+// Should be removed when layers are improved.
+
+.contents-upload-modal .content .table .upload-row .image {
+  max-width: 100%;
+}